Some bf(...) tweaks.

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index 0b338f3..5370cb7 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -1,41 +1,39 @@
-/* -*- c-file-style: "linux"; -*-
-
-   Copyright (C) 1998-2000 by Andrew Tridgell
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/*
+ * Support rsync daemon authentication.
+ *
+ * Copyright (C) 1998-2000 Andrew Tridgell
+ * Copyright (C) 2002, 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
-/* support rsync authentication */
 #include "rsync.h"
 
 extern char *password_file;
-extern int am_root;
 
 /***************************************************************************
 encode a buffer using base64 - simple and slow algorithm. null terminates
 the result.
   ***************************************************************************/
-void base64_encode(char *buf, int len, char *out)
+void base64_encode(char *buf, int len, char *out, int pad)
 {
        char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
        int bit_offset, byte_offset, idx, i;
        unsigned char *d = (unsigned char *)buf;
        int bytes = (len*8 + 5)/6;
 
-       memset(out, 0, bytes+1);
-
        for (i = 0; i < bytes; i++) {
                byte_offset = (i*6)/8;
                bit_offset = (i*6)%8;
@@ -49,6 +47,11 @@ void base64_encode(char *buf, int len, char *out)
                }
                out[i] = b64[idx];
        }
+
+       while (pad && (i % 4))
+               out[i++] = '=';
+
+       out[i] = '\0';
 }
 
 /* Generate a challenge buffer and return it base64-encoded. */
@@ -70,7 +73,7 @@ static void gen_challenge(char *addr, char *challenge)
        sum_update(input, sizeof input);
        sum_end(md4_out);
 
-       base64_encode(md4_out, MD4_SUM_LENGTH, challenge);
+       base64_encode(md4_out, MD4_SUM_LENGTH, challenge, 0);
 }
 
 
@@ -90,13 +93,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 +163,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;
        }
@@ -209,7 +212,7 @@ static void generate_hash(char *in, char *challenge, char *out)
        sum_update(challenge, strlen(challenge));
        sum_end(buf);
 
-       base64_encode(buf, MD4_SUM_LENGTH, out);
+       base64_encode(buf, MD4_SUM_LENGTH, out, 0);
 }
 
 /* Possibly negotiate authentication with the client.  Use "leader" to
@@ -223,7 +226,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;