Changeset 740 for vendor/current/source3/libsmb/samlogon_cache.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/libsmb/samlogon_cache.c (modified) (11 diffs)

vendor/current/source3/libsmb/samlogon_cache.c ¶

@@ -23 +23 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 #define NETSAMLOGON_TDB "netsamlogon_cache.tdb"
@@ -46 +49 @@
         path = cache_path(NETSAMLOGON_TDB);
 again:
-        tdb = tdb_open_log(path, 0, TDB_DEFAULT,
+        tdb = tdb_open_log(path, 0, TDB_DEFAULT|TDB_INCOMPATIBLE_HASH,
                            O_RDWR | O_CREAT, 0600);
         if (tdb == NULL) {
@@ -70 +73 @@
 
         DEBUG(0,("retry after CLEAR_IF_FIRST for '%s'\n", path));
-        tdb = tdb_open_log(path, 0, TDB_CLEAR_IF_FIRST,
+        tdb = tdb_open_log(path, 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
                            O_RDWR | O_CREAT, 0600);
         if (tdb) {
@@ -99 +102 @@
 ***********************************************************************/
 
-void netsamlogon_clear_cached_user(struct netr_SamInfo3 *info3)
-{
-        DOM_SID user_sid;
-        fstring keystr, tmp;
-
-        if (!info3) {
-                return;
-        }
+void netsamlogon_clear_cached_user(const struct dom_sid *user_sid)
+{
+        fstring keystr;
 
         if (!netsamlogon_cache_init()) {
@@ -114 +112 @@
                 return;
         }
-        sid_copy(&user_sid, info3->base.domain_sid);
-        sid_append_rid(&user_sid, info3->base.rid);
 
         /* Prepare key as DOMAIN-SID/USER-RID string */
-        slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
+        sid_to_fstring(keystr, user_sid);
 
         DEBUG(10,("netsamlogon_clear_cached_user: SID [%s]\n", keystr));
@@ -133 +129 @@
 {
         TDB_DATA data;
-        fstring keystr, tmp;
+        fstring keystr;
         bool result = false;
-        DOM_SID user_sid;
+        struct dom_sid  user_sid;
         time_t t = time(NULL);
         TALLOC_CTX *mem_ctx;
@@ -152 +148 @@
         }
 
-        sid_copy(&user_sid, info3->base.domain_sid);
-        sid_append_rid(&user_sid, info3->base.rid);
+        sid_compose(&user_sid, info3->base.domain_sid, info3->base.rid);
 
         /* Prepare key as DOMAIN-SID/USER-RID string */
-        slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
+        sid_to_fstring(keystr, &user_sid);
 
         DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
@@ -181 +176 @@
         }
 
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, &r,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &r,
                                        (ndr_push_flags_fn_t)ndr_push_netsamlogoncache_entry);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -206 +201 @@
 ***********************************************************************/
 
-struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
+struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const struct dom_sid *user_sid)
 {
         struct netr_SamInfo3 *info3 = NULL;
@@ -237 +232 @@
         blob = data_blob_const(data.dptr, data.dsize);
 
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &r,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
                                       (ndr_pull_flags_fn_t)ndr_pull_netsamlogoncache_entry);
 
@@ -279 +274 @@
 }
 
-bool netsamlogon_cache_have(const DOM_SID *user_sid)
+bool netsamlogon_cache_have(const struct dom_sid *user_sid)
 {
         TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");