X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/00d760f7506c2d5c32ab5abf9f11b3066999f08a..ee412cbd5c0667742a128fb4e1c89801528a9a48:/sbr/ruserpass.c

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 513fb117..2a1023f8 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -21,8 +21,12 @@
  * distribution for complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "getpass.h"
+#include "ruserpass.h"
+#include "credentials.h"
+#include "error.h"
+#include "h/utils.h"
 #include <pwd.h>
 
 static FILE *cfile;
@@ -64,7 +68,7 @@ static int token(char *);
 void
 ruserpass(const char *host, char **aname, char **apass, int flags)
 {
-    int t, usedefault = 0;
+    int t;
     struct stat stb;
 
     init_credentials_file ();
@@ -77,10 +81,11 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
         char tokval[MAX_TOKVAL_SIZE];
         tokval[0] = '\0';
 
+        bool usedefault = false;
 	while ((t = token(tokval))) {
 	    switch(t) {
 	    case DEFAULT:
-		usedefault = 1;
+		usedefault = true;
 		/* FALLTHRU */
 
 	    case MACH:
@@ -170,7 +175,7 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
 	    mypass = *aname;
 	}
 
-        *aname = mh_xstrdup(mypass);
+        *apass = mh_xstrdup(mypass);
     }
 
 }