Commit 5d78a102 authored by Andrew Tridgell's avatar Andrew Tridgell

allow shell wildcards in auth users lines

parent 4d66e00a
...@@ -234,12 +234,12 @@ char *auth_server(int fd, int module, char *addr, char *leader) ...@@ -234,12 +234,12 @@ char *auth_server(int fd, int module, char *addr, char *leader)
if (sscanf(line,"%99s %29s", user, pass) != 2) { if (sscanf(line,"%99s %29s", user, pass) != 2) {
return NULL; return NULL;
} }
users = strdup(users); users = strdup(users);
if (!users) return NULL; if (!users) return NULL;
for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) { for (tok=strtok(users," ,\t"); tok; tok = strtok(NULL," ,\t")) {
if (strcmp(tok, user) == 0) break; if (fnmatch(tok, user, 0) == 0) break;
} }
free(users); free(users);
......
...@@ -208,13 +208,14 @@ on the server that contains include patterns, one per line. This is ...@@ -208,13 +208,14 @@ on the server that contains include patterns, one per line. This is
equivalent to the client specifying the --include-from option with a equivalent to the client specifying the --include-from option with a
equivalent file. equivalent file.
dit(bf(auth users)) The "auth users" option specifies a comma dit(bf(auth users)) The "auth users" option specifies a comma and
and space separated list of usernames that will be allowed to connect space separated list of usernames that will be allowed to connect to
to this module. The usernames do not need to exist on the local this module. The usernames do not need to exist on the local
system. If "auth users" is set then the client will be challenged to system. The usernames may also contain shell wildcard characters. If
supply a username and password to connect to the module. A challenge "auth users" is set then the client will be challenged to supply a
response authentication protocol is used for this exchange. The plain username and password to connect to the module. A challenge response
text usernames are passwords are stored in the file specified by the authentication protocol is used for this exchange. The plain text
usernames are passwords are stored in the file specified by the
"secrets file" option. The default is for all users to be able to "secrets file" option. The default is for all users to be able to
connect without a password (this is called "anonymous rsync"). connect without a password (this is called "anonymous rsync").
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment