Changed some names since "depth" wasn't really the right term.

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index a1c3575..7da25d4 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -82,7 +82,7 @@ static int get_secret(int module, char *user, char *secret, int len)
 
        if (!fname || !*fname) return 0;
 
-       fd = open(fname,O_RDONLY | O_TEXT);
+       fd = open(fname,O_RDONLY);
        if (fd == -1) return 0;
 
        if (do_stat(fname, &st) == -1) {
@@ -144,7 +144,7 @@ static char *getpassf(char *filename)
 
        if (!filename) return NULL;
 
-       if ( (fd=open(filename,O_RDONLY | O_TEXT)) == -1) {
+       if ( (fd=open(filename,O_RDONLY)) == -1) {
                rsyserr(FERROR, errno, "could not open password file \"%s\"",filename);
                if (envpw) rprintf(FERROR,"falling back to RSYNC_PASSWORD environment variable.\n");    
                return NULL;
@@ -273,8 +273,14 @@ void auth_client(int fd, char *user, char *challenge)
 
        if (!(pass=getpassf(password_file)) && !(pass=getenv("RSYNC_PASSWORD"))) {
                /* XXX: cyeoh says that getpass is deprecated, because
-                  it may return a truncated password on some systems,
-                  and it is not in the LSB. */
+                * it may return a truncated password on some systems,
+                * and it is not in the LSB.
+                 *
+                 * Andrew Klein says that getpassphrase() is present
+                 * on Solaris and reads up to 256 characters.
+                 *
+                 * OpenBSD has a readpassphrase() that might be more suitable.
+                 */
                pass = getpass("Password: ");
        }