X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d850c88b75c333607ef22e50ffced3914297a4b8..07916b2ff:/sbr/ruserpass.c?ds=inline

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index f5fc6bd8..1e43571e 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -1,4 +1,5 @@
-/*
+/* ruserpass.c -- parse .netrc-format file.
+ *
  * Portions of this code are
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
@@ -80,7 +81,7 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
 	    switch(t) {
 	    case DEFAULT:
 		usedefault = 1;
-		/* FALL THROUGH */
+		/* FALLTHRU */
 
 	    case MACH:
 		if (!usedefault) {
@@ -107,8 +108,8 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
 			    (stb.st_mode & 077) != 0) {
 			    /* We make this a fatal error to force the
 			       user to correct it. */
-			    advise(NULL, "Error - file %s must not be world or "
-				   "group readable.", credentials_file);
+                            inform("group or other permissions, %#o, "
+                                "forbidden: %s", stb.st_mode, credentials_file);
 			    adios(NULL, "Remove password or correct file "
 				  "permissions.");
 			}
@@ -147,10 +148,10 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
 	}
 	printf("Name (%s:%s): ", host, myname);
 
-	if (fgets(tmp, sizeof(tmp) - 1, stdin) == NULL) {
+	if (fgets(tmp, sizeof tmp, stdin) == NULL) {
 	    advise ("tmp", "fgets");
 	}
-        TrimSuffixC(tmp, '\n');
+        trim_suffix_c(tmp, '\n');
 	if (*tmp != '\0' || myname == NULL) {
 	    myname = tmp;
 	}