summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-11-08 23:08:59 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-11-08 23:08:59 +0000
commitc19598f2a6a3329e973e14e389e0577ebb914f3b (patch)
treea3a5040c9598eb21ca60ba73f16061828a08493d /source3/utils
parent3b90ef84a5907ca5a1bc460adab5f52e940b5b72 (diff)
downloadsamba-c19598f2a6a3329e973e14e389e0577ebb914f3b.tar.gz
samba-c19598f2a6a3329e973e14e389e0577ebb914f3b.tar.bz2
samba-c19598f2a6a3329e973e14e389e0577ebb914f3b.zip
Merge from HEAD:
- change auth_sam to use the initialisation flags to determine if the password attributes are set - add const to secrets.c, cliconnect.c - passdb: fix spelling in pdb_ldap, add group mapping back to smbpasswd - SAMR: add debugs to show what fails for group enum. Andrew Bartlett (This used to be commit 4e74d00b3634abf52aa24bfaa6dbe88202aa57a1)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbpasswd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 75a4319cb9..0e822ee7ad 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -122,7 +122,7 @@ static int process_options(int argc, char **argv, int local_flags)
local_flags |= LOCAL_INTERDOM_ACCOUNT;
break;
case 'j':
- d_printf("See 'net rpc join' for this functionality\n");
+ d_printf("See 'net join' for this functionality\n");
exit(1);
break;
case 'n':