diff options
author | Gerald Carter <jerry@samba.org> | 2002-05-01 19:47:33 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-05-01 19:47:33 +0000 |
commit | 5bcb538b955d3186f0bb1e2e55e5a75abb8822a5 (patch) | |
tree | c93385d5c50c1cf79d20349949d7f02e406200cc | |
parent | 4d43dc00e29ec77e3c5545604479f7c69b6b6086 (diff) | |
download | samba-5bcb538b955d3186f0bb1e2e55e5a75abb8822a5.tar.gz samba-5bcb538b955d3186f0bb1e2e55e5a75abb8822a5.tar.xz samba-5bcb538b955d3186f0bb1e2e55e5a75abb8822a5.zip |
merge from SAMBA_2_2
-rw-r--r-- | source/passdb/pdb_nisplus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/passdb/pdb_nisplus.c b/source/passdb/pdb_nisplus.c index b27234a4e5b..314ea3c8ed5 100644 --- a/source/passdb/pdb_nisplus.c +++ b/source/passdb/pdb_nisplus.c @@ -1178,7 +1178,7 @@ BOOL pdb_add_sam_account(SAM_ACCOUNT * newpwd) * domain, where smbpasswd entry should be stored. */ -#if 0 +#if 1 /* passwd and smbpasswd users should be in the same domain */ nisname = make_nisname_from_name(pdb_get_username(newpwd), "passwd.org_dir"); @@ -1236,7 +1236,7 @@ BOOL pdb_add_sam_account(SAM_ACCOUNT * newpwd) /* we need full name for nis_add_entry() */ slprintf(pfiletmp, sizeof(pfiletmp)-1, "%s.%s", obj->zo_name, obj->zo_domain); -#if 0 +#if 1 /* matching } from previous #if */ } #endif |