diff options
author | David O'Neill <dmo@samba.org> | 2001-01-11 20:41:19 +0000 |
---|---|---|
committer | David O'Neill <dmo@samba.org> | 2001-01-11 20:41:19 +0000 |
commit | 376601d17d53ef7bfaafa576bd770e554516e808 (patch) | |
tree | e5bb9efa7d26af9c31393db72224fbfeb13e962c /source/smbd | |
parent | 6dc83a8c665dd6774ce597cf7269ad4d8c5380cf (diff) | |
download | samba-376601d17d53ef7bfaafa576bd770e554516e808.tar.gz samba-376601d17d53ef7bfaafa576bd770e554516e808.tar.xz samba-376601d17d53ef7bfaafa576bd770e554516e808.zip |
Changes from APPLIANCE_HEAD:
testsuite/printing/psec.c
- Use lock directory from smb.conf parameter when peeking at the
ntdrivers.tdb file.
source/rpc_parse/parse_sec.c
- fix typo in debug message
source/script/installbin.sh
- create private directory as part of 'make install'.
source/nsswitch/winbindd_cache.c
source/nsswitch/winbindd_idmap.c
source/passdb/secrets.c
source/smbd/connection.c
- always convert tdb key to unix code-page when generating.
source/printing/nt_printing.c
- always convert tdb key to unix code-page when generating.
- don't prepend path to a filename that is NULL in
add_a_printer_driver_3().
source/rpc_server/srv_spoolss_nt.c
- always convert tdb key to unix code-page when generating.
- don't prepend server name to a path/filename that is NULL in the
fill_printer_driver_info functions.
source/printing/printing.c
- always convert tdb key to unix code-page when generating.
- move access check for print_queue_purge() outside of job delete
loop.
source/smbd/unix_acls.c
- fix for setting ACLs (this got missed earlier)
source/lib/messages.c
- trivial sync with appliance_head
Diffstat (limited to 'source/smbd')
-rw-r--r-- | source/smbd/connection.c | 2 | ||||
-rw-r--r-- | source/smbd/unix_acls.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/smbd/connection.c b/source/smbd/connection.c index b0b4bbab7b7..8ab4e0c5d3f 100644 --- a/source/smbd/connection.c +++ b/source/smbd/connection.c @@ -57,6 +57,7 @@ BOOL yield_connection(connection_struct *conn,char *name,int max_connections) key.pid = sys_getpid(); key.cnum = conn?conn->cnum:-1; fstrcpy(key.name, name); + dos_to_unix(key.name, True); /* Convert key to unix-codepage */ kbuf.dptr = (char *)&key; kbuf.dsize = sizeof(key); @@ -93,6 +94,7 @@ BOOL claim_connection(connection_struct *conn,char *name,int max_connections,BOO key.pid = sys_getpid(); key.cnum = conn?conn->cnum:-1; fstrcpy(key.name, name); + dos_to_unix(key.name, True); /* Convert key to unix-codepage */ kbuf.dptr = (char *)&key; kbuf.dsize = sizeof(key); diff --git a/source/smbd/unix_acls.c b/source/smbd/unix_acls.c index 2e16611b0cb..9ab057f77aa 100644 --- a/source/smbd/unix_acls.c +++ b/source/smbd/unix_acls.c @@ -186,6 +186,7 @@ static BOOL unpack_nt_permissions(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *p */ if (security_info_sent & OWNER_SECURITY_INFORMATION) { + sid_copy(&owner_sid, psd->owner_sid); if (!sid_to_uid( &owner_sid, puser, &sid_type)) DEBUG(3,("unpack_nt_permissions: unable to validate owner sid.\n")); } @@ -196,6 +197,7 @@ static BOOL unpack_nt_permissions(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *p */ if (security_info_sent & GROUP_SECURITY_INFORMATION) { + sid_copy(&grp_sid, psd->grp_sid); if (!sid_to_gid( &grp_sid, pgrp, &sid_type)) DEBUG(3,("unpack_nt_permissions: unable to validate group sid.\n")); } |