remove_any_whitespace_to_the_left_or_right_of_at_symbol() is awesomized and no longer...

[citadel.git] / citadel / utils / chkpwd.c

diff --git a/citadel/utils/chkpwd.c b/citadel/utils/chkpwd.c
index 7e9f39010357bd64d9ded9116732b007b7eec4b9..4dfc594e29ef8c22c4f9b080739d48190ee48984 100644 (file)
--- a/citadel/utils/chkpwd.c
+++ b/citadel/utils/chkpwd.c
@@ -1,25 +1,16 @@
 /*
- * $Id$
- *
  * a setuid helper program for machines which use shadow passwords
  * by Nathan Bryant, March 1999
  *
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <pwd.h>
@@ -31,6 +22,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <libcitadel.h>
+
 #include "auth.h"
 #include "config.h"
 #include "citadel_dirs.h"
@@ -39,13 +32,12 @@
 int main(void)
 {
        uid_t uid;
-       size_t siz;
        char buf[SIZ];
 
        while (1) {
                buf[0] = '\0';
-               siz = read(0, &uid, sizeof(uid_t));     /* uid */
-               siz = read(0, buf, 256);        /* password */
+               read(0, &uid, sizeof(uid_t));   /* uid */
+               read(0, buf, 256);      /* password */
 
                if (buf[0] == '\0') 
                        return (0);