diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-11-09 09:30:21 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-11-09 09:30:21 +0000 |
| commit | 30d0680106c74901d6fc0c993c3c4770cd2efb22 (patch) | |
| tree | 25bd70ff2a6e3155287c0ca1c8ca026f8298d5da | |
| parent | f9230c937b1304e6864aa020a4e102749ca6f8ae (diff) | |
| download | samba-30d0680106c74901d6fc0c993c3c4770cd2efb22.tar.gz samba-30d0680106c74901d6fc0c993c3c4770cd2efb22.tar.bz2 samba-30d0680106c74901d6fc0c993c3c4770cd2efb22.zip | |
Merge from 3.0:
source/passdb/pdb_get_set.c:
I agree with vl's #if 0 here, and am not quite sure what I was
thinking with regard to the original code.
Let's keep samba simple, and just remove it.
source/rpc_server/srv_netlog_nt.c:
Remove compleatly wrong comments. (There were correct, 2 years ago...)
source/intl/lang_tdb.c:
Add newline to debug message
Andrew Bartlett
(This used to be commit 2a8dbe03690b60f3d9c83de3cf6ce873aa0657bc)
| -rw-r--r-- | source3/intl/lang_tdb.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_get_set.c | 13 | ||||
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 6 |
3 files changed, 1 insertions, 20 deletions
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c index b0e9e414de..b98e5734cb 100644 --- a/source3/intl/lang_tdb.c +++ b/source3/intl/lang_tdb.c @@ -131,7 +131,7 @@ BOOL lang_tdb_init(const char *lang) asprintf(&msg_path, "%s.msg", lib_path((const char *)lang)); if (stat(msg_path, &st) != 0) { /* the msg file isn't available */ - DEBUG(10, ("lang_tdb_init: %s: %s", msg_path, + DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, strerror(errno))); goto done; } diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index 46c49be8b1..4a5a5759d4 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -1045,19 +1045,6 @@ BOOL pdb_set_backend_private_data (SAM_ACCOUNT *sampass, void *private_data, if (!sampass) return False; -#if 0 - /* With this check backend_private_data_free_fn is *never* set - as the methods are never set anywhere. What is this - supposed to do ???? - - Volker - */ - - /* does this backend 'own' this SAM_ACCOUNT? */ - if (my_methods != sampass->private.backend_private_methods) - return False; -#endif - if (sampass->private.backend_private_data && sampass->private.backend_private_data_free_fn) { sampass->private.backend_private_data_free_fn(&sampass->private.backend_private_data); } diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 66fa6e7678..5ba3dac669 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -581,8 +581,6 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * return NT_STATUS_INVALID_INFO_CLASS; } /* end switch */ - /* check username exists */ - rpcstr_pull(nt_username,uni_samlogon_user->buffer,sizeof(nt_username),uni_samlogon_user->uni_str_len*2,0); rpcstr_pull(nt_domain,uni_samlogon_domain->buffer,sizeof(nt_domain),uni_samlogon_domain->uni_str_len*2,0); rpcstr_pull(nt_workstation,uni_samlogon_workstation->buffer,sizeof(nt_workstation),uni_samlogon_workstation->uni_str_len*2,0); @@ -593,10 +591,6 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * fstrcpy(current_user_info.smb_name, nt_username); sub_set_smb_name(nt_username); - /* - * Convert to a UNIX username. - */ - DEBUG(5,("Attempting validation level %d for unmapped username %s.\n", q_u->sam_id.ctr->switch_value, nt_username)); status = NT_STATUS_OK; |