diff options
| author | Jeremy Allison <jra@samba.org> | 1998-05-06 18:14:02 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-05-06 18:14:02 +0000 |
| commit | b54509045d7186fc0526d91bcf429659cba8be1d (patch) | |
| tree | aaf529823ffb62ad2b350c156885ab849b38db9a /source3/lib | |
| parent | 2b4d426726cad43db6ef2889c83d898b52a2018f (diff) | |
| download | samba-b54509045d7186fc0526d91bcf429659cba8be1d.tar.gz samba-b54509045d7186fc0526d91bcf429659cba8be1d.tar.bz2 samba-b54509045d7186fc0526d91bcf429659cba8be1d.zip | |
loadparm.c: Added #ifdef USE_LDAP around ldap code.
server.c: Moved %U, %G and %N into standard_sub() from standard_sub_basic()
as only smbd knows about usernames. Also fixes problem with calling
standard_sub_basic() from loadparm.c.
smbpass.c: Partial tidyup of machine_password_lock() code - not finished yet.
util.c: Moved %U, %G and %N into standard_sub() from standard_sub_basic()
as only smbd knows about usernames. Also fixes problem with calling
standard_sub_basic() from loadparm.c.
lib/rpc/server/srv_ldap_helpers.c: Added #ifdef USE_LDAP around ldap code.
lib/rpc/server/srv_samr.c: Added #ifdef USE_LDAP around ldap code.
Jeremy.
(This used to be commit 446b98ca071170fc950bad86ad96b58308a5b75c)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/util.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index a081cf0368..f5cfb974a2 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -4000,32 +4000,16 @@ void standard_sub_basic(char *str) { char *s, *p; char pidstr[10]; - struct passwd *pass; - char *username = sam_logon_in_ssb ? samlogon_user : sesssetup_user; for (s = str ; s && *s && (p = strchr(s,'%')); s = p ) { switch (*(p+1)) { - case 'G' : - { - if ((pass = Get_Pwnam(sesssetup_user,False))!=NULL) - { - string_sub(p,"%G",gidtoname(pass->pw_gid)); - } - else - { - p += 2; - } - break; - } - case 'N' : string_sub(p,"%N", automount_server(username)); break; case 'I' : string_sub(p,"%I", client_addr(Client)); break; case 'L' : string_sub(p,"%L", local_machine); break; case 'M' : string_sub(p,"%M", client_name(Client)); break; case 'R' : string_sub(p,"%R", remote_proto); break; case 'T' : string_sub(p,"%T", timestring()); break; - case 'U' : string_sub(p,"%U", username); break; case 'a' : string_sub(p,"%a", remote_arch); break; case 'd' : { |