diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-05-25 07:37:44 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-05-25 07:37:44 +0000 |
| commit | 20efe2fe6cbc4b5cf861a3296e29f5495637f79c (patch) | |
| tree | 320ae01d545132da8faeb265e7702254bb4bfb3d /source3/lib | |
| parent | 9921fd9d0ef9a8862b371eec17d47a9e78c5ad67 (diff) | |
| download | samba-20efe2fe6cbc4b5cf861a3296e29f5495637f79c.tar.gz samba-20efe2fe6cbc4b5cf861a3296e29f5495637f79c.tar.bz2 samba-20efe2fe6cbc4b5cf861a3296e29f5495637f79c.zip | |
Clean up a few unused functions, add a bit of static etc.
Importantly:
The removal of the silly 'delete user script' behaviour when secuity=domain.
I have left the name the same - as it still does the (previously documented,
but not in smb.conf(5)) sane behaviour of deleting users on request.
When we decide what to do with the 'add user' functionality, we might
rename it.
Andrew Bartlett
(This used to be commit cdcfe3671eb7570e15649b77f708e6579055e7bc)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/substitute.c | 19 | ||||
| -rw-r--r-- | source3/lib/username.c | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 09921c145d..6c56cdd480 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -226,7 +226,7 @@ void standard_sub_basic(const char *smb_name, char *str) Do some standard substitutions in a string. ****************************************************************************/ -void standard_sub_advanced(int snum, const char *user, const char *connectpath, gid_t gid, const char *smb_name, char *str) +static void standard_sub_advanced(int snum, const char *user, const char *connectpath, gid_t gid, const char *smb_name, char *str) { char *p, *s, *home; @@ -391,20 +391,3 @@ void standard_sub_snum(int snum, char *str) standard_sub_advanced(snum, cached_user, "", -1, current_user_info.smb_name, str); } -/******************************************************************* - Substitute strings with useful parameters. -********************************************************************/ - -void standard_sub_vuser(char *str, user_struct *vuser) -{ - standard_sub_advanced(-1, vuser->user.unix_name, "", -1, current_user_info.smb_name, str); -} - -/******************************************************************* - Substitute strings with useful parameters. -********************************************************************/ - -void standard_sub_vsnum(char *str, user_struct *vuser, int snum) -{ - standard_sub_advanced(snum, vuser->user.unix_name, "", -1, current_user_info.smb_name, str); -} diff --git a/source3/lib/username.c b/source3/lib/username.c index f6ce765b41..be8acfb4d6 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -30,7 +30,7 @@ static struct passwd *uname_string_combinations2(char *s, int offset, struct pas *local* people, there's nothing for you here...). *****************************************************************/ -BOOL name_is_local(const char *name) +static BOOL name_is_local(const char *name) { return !(strchr_m(name, *lp_winbind_separator())); } |