Renamed sum_table -> hash_table.

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 0b338f3..ff7eef2 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -21,7 +21,6 @@
 #include "rsync.h"
 
 extern char *password_file;
-extern int am_root;
 
 /***************************************************************************
 encode a buffer using base64 - simple and slow algorithm. null terminates
@@ -90,13 +89,13 @@ static int get_secret(int module, char *user, char *secret, int len)
                return 0;
 
        if (do_stat(fname, &st) == -1) {
-               rsyserr(FLOG, errno, "stat(%s)", safe_fname(fname));
+               rsyserr(FLOG, errno, "stat(%s)", fname);
                ok = 0;
        } else if (lp_strict_modes(module)) {
                if ((st.st_mode & 06) != 0) {
                        rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
                        ok = 0;
-               } else if (am_root && (st.st_uid != 0)) {
+               } else if (MY_UID() == 0 && st.st_uid != 0) {
                        rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
                        ok = 0;
                }
@@ -160,19 +159,19 @@ static char *getpassf(char *filename)
 
        if ((fd = open(filename,O_RDONLY)) < 0) {
                rsyserr(FERROR, errno, "could not open password file \"%s\"",
-                       safe_fname(filename));
+                       filename);
                if (envpw)
                        rprintf(FERROR, "falling back to RSYNC_PASSWORD environment variable.\n");
                return NULL;
        }
 
        if (do_stat(filename, &st) == -1) {
-               rsyserr(FERROR, errno, "stat(%s)", safe_fname(filename));
+               rsyserr(FERROR, errno, "stat(%s)", filename);
                ok = 0;
        } else if ((st.st_mode & 06) != 0) {
                rprintf(FERROR,"password file must not be other-accessible\n");
                ok = 0;
-       } else if (am_root && st.st_uid != 0) {
+       } else if (MY_UID() == 0 && st.st_uid != 0) {
                rprintf(FERROR,"password file must be owned by root when running as root\n");
                ok = 0;
        }
@@ -223,7 +222,7 @@ char *auth_server(int f_in, int f_out, int module, char *host, char *addr,
 {
        char *users = lp_auth_users(module);
        char challenge[MD4_SUM_LENGTH*2];
-       char line[MAXPATHLEN];
+       char line[BIGPATHBUFLEN];
        char secret[512];
        char pass2[MD4_SUM_LENGTH*2];
        char *tok, *pass;