Changeset 740 for vendor/current/source3/lib/afs.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/lib/afs.c (modified) (4 diffs)

vendor/current/source3/lib/afs.c ¶

@@ -24 +24 @@
 #define NO_ASN1_TYPEDEFS 1
 
+#include "secrets.h"
+#include "passdb.h"
+#include "auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -220 +225 @@
         bool result;
         char *ticket_str = NULL;
-        const DOM_SID *user_sid;
+        const struct dom_sid *user_sid;
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -232 +237 @@
 
         afs_username = talloc_sub_advanced(ctx,
-                                SNUM(conn), conn->server_info->unix_name,
-                                conn->connectpath, conn->server_info->utok.gid,
-                                conn->server_info->sanitized_username,
-                                pdb_get_domain(conn->server_info->sam_account),
+                                lp_servicename(SNUM(conn)),
+                                conn->session_info->unix_name,
+                                conn->connectpath, conn->session_info->utok.gid,
+                                conn->session_info->sanitized_username,
+                                conn->session_info->info3->base.domain.string,
                                 afs_username);
         if (!afs_username) {
@@ -241 +247 @@
         }
 
-        user_sid = &conn->server_info->ptok->user_sids[0];
+        user_sid = &conn->session_info->security_token->sids[0];
         afs_username = talloc_string_sub(talloc_tos(),
                                         afs_username,