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/rpc_server | |
| 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/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_ldap_helpers.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_ldap_helpers.c b/source3/rpc_server/srv_ldap_helpers.c index d1c091c6c9..945c06ad27 100644 --- a/source3/rpc_server/srv_ldap_helpers.c +++ b/source3/rpc_server/srv_ldap_helpers.c @@ -159,4 +159,7 @@ BOOL ldap_get_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid) return(True); } +#else /* USE_LDAP */ +/* this keeps fussy compilers happy */ +void ldap_helper_dummy(void) {} #endif diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index aa240ad3c6..353da9bd29 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -469,7 +469,7 @@ static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, got_pwds = get_smbpwd_entries(pass, &total_entries, &num_entries, MAX_SAM_ENTRIES, 0); unbecome_root(True); -#endif +#endif /* USE_LDAP */ switch (q_u->switch_level) { @@ -485,7 +485,7 @@ static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, MAX_SAM_ENTRIES, 0, switch_level); -#endif +#endif /* USE_DLAP */ make_sam_info_1(&info1, ACB_NORMAL, q_u->start_idx, num_entries, pass); @@ -504,7 +504,7 @@ static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, MAX_SAM_ENTRIES, 0, switch_level); -#endif +#endif /* USE_LDAP */ make_sam_info_2(&info2, ACB_WSTRUST, q_u->start_idx, num_entries, pass); @@ -1046,9 +1046,9 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u, info = (void*)&id21; #ifdef USE_LDAP status = ldap_get_user_info_21(&id21, rid) ? 0 : NT_STATUS_NO_SUCH_USER; -#else +#else /* USE_LDAP */ status = get_user_info_21(&id21, rid) ? 0 : NT_STATUS_NO_SUCH_USER; -#endif +#endif /* USE_LDAP */ break; } |