Renamed validpw() in auth.c to validate_password()

[citadel.git] / citadel / chkpwd.c

diff --git a/citadel/chkpwd.c b/citadel/chkpwd.c
index ece82c2a1129e90d53447f5f11bf31f26a13b3d0..bb15e7a1ecc8d3f38ba622e1044bb78fea82c66f 100644 (file)
--- a/citadel/chkpwd.c
+++ b/citadel/chkpwd.c
@@ -17,6 +17,7 @@
 
 #include "auth.h"
 #include "config.h"
+#include "citadel_dirs.h"
 #include "citadel.h"
 
 int main(void)
@@ -24,7 +25,13 @@ int main(void)
   uid_t uid;
   struct passwd *pw;
   char buf[SIZ];
+  int relh=0;
+  int home=0;
+  char relhome[PATH_MAX]="";
+  char ctdldir[PATH_MAX]=CTDLDIR;
 
+  /* TODO: should we be able to calculate relative dirs? */
+  calc_dirs_n_files(relh, home, relhome, ctdldir);
   get_config();
   uid = getuid();
 
@@ -48,7 +55,7 @@ int main(void)
 
   strtok(buf, "\n");
 
-  if (validpw(uid, buf))
+  if (validate_password(uid, buf))
     return 0;
 
   return 1;