diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-09 17:18:15 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-09 17:18:15 -0400 |
| commit | c4db092555d8c7f309f5fd7d6cc2243000889e8b (patch) | |
| tree | 3d6733aa06407ed9c38eccf09d675783cbd5f72f /src | |
| parent | e21bc61b2b073fc2fb4bc0fc9dc9a9508b18989f (diff) | |
- clarify that the domain is meant to be replaced
- default to _PATH_BSHELL for %{loginShell}
Diffstat (limited to 'src')
| -rw-r--r-- | src/defs-nis.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index 9059248..99dd3db 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -25,6 +25,7 @@ #include <rpc/xdr.h> #include <fnmatch.h> +#include <paths.h> #include <string.h> #include "defs-nis.h" @@ -46,12 +47,12 @@ static struct configuration { {"passwd.byname", config_exact, FALSE, "(objectClass=posixAccount)", "%{uid}", NULL, - "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell}", + "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", ":"}, {"passwd.byuid", config_exact, FALSE, "(objectClass=posixAccount)", "%{uidNumber}", NULL, - "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell}", + "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", ":"}, {"group.byname", config_exact, FALSE, "(objectClass=posixGroup)", @@ -240,7 +241,7 @@ main(int argc, char **argv) unsigned int i; int c; const char *domain, *suffix; - domain = "@example.com@"; + domain = "@domain@"; suffix = "@suffix@"; while ((c = getopt(argc, argv, "d:s:")) != -1) { switch (c) { |