I can't see the screen with my sunglasses on

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

diff --git a/citadel/utils/chkpwd.c b/citadel/utils/chkpwd.c
index 6182e7ac71090d8cd202d5ffd902f7b92be07d75..70baf53e765df14bdb2250251fed4ee97ac0df2d 100644 (file)
--- a/citadel/utils/chkpwd.c
+++ b/citadel/utils/chkpwd.c
@@ -1,24 +1,9 @@
-/*
- * a setuid helper program for machines which use shadow passwords
- * by Nathan Bryant, March 1999
- *
- *
- * 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 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
- */
+// a setuid helper program for machines which use shadow passwords
+//
+// Copyright (c) 1987-2022 by Nathan Bryant and the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include <pwd.h>
 #include <stdio.h>
@@ -28,25 +13,25 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/types.h>
-
+#include <libcitadel.h>
 #include "auth.h"
-#include "config.h"
-#include "citadel_dirs.h"
-#include "citadel.h"
+#include "../server/config.h"
+#include "../server/citadel_dirs.h"
+#include "../server/citadel.h"
+
 
-int main(void)
-{
+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') 
+               if (buf[0] == '\0') {
                        return (0);
+               }
                if (validate_password(uid, buf)) {
                        write(1, "PASS", 4);
                }