Changeset 745 for trunk/server/source3/smbd/share_access.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/share_access.c (modified) (6 diffs)

trunk/server/source3/smbd/share_access.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "../libcli/security/security.h"
+#include "passdb/lookup_sid.h"
+#include "auth.h"
 
 /*
@@ -68 +72 @@
                                 const char *domain,
                                 const char *sharename,
-                                const struct nt_user_token *token,
+                                const struct security_token *token,
                                 const char *name)
 {
         const char *prefix;
-        DOM_SID sid;
+        struct dom_sid sid;
         enum lsa_SidType type;
-        struct smbd_server_connection *sconn = smbd_server_conn;
 
         if (username != NULL) {
@@ -132 +135 @@
                 if (*prefix == '&') {
                         if (username) {
-                                if (user_in_netgroup(sconn, username, name)) {
+                                if (user_in_netgroup(mem_ctx, username, name)) {
                                         return True;
                                 }
@@ -157 +160 @@
                                  const char *domain,
                                  const char *sharename,
-                                 const struct nt_user_token *token,
+                                 const struct security_token *token,
                                  const char **list)
 {
@@ -197 +200 @@
 
 bool user_ok_token(const char *username, const char *domain,
-                   const struct nt_user_token *token, int snum)
+                   const struct security_token *token, int snum)
 {
         if (lp_invalid_users(snum) != NULL) {
@@ -257 +260 @@
 bool is_share_read_only_for_token(const char *username,
                                   const char *domain,
-                                  const struct nt_user_token *token,
+                                  const struct security_token *token,
                                   connection_struct *conn)
 {