Changeset 745 for trunk/server/testsuite

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)
• testsuite/headers (copied) (copied from vendor/current/testsuite/headers )
• testsuite/headers/test_headers.c (copied) (copied from vendor/current/testsuite/headers/test_headers.c )
• testsuite/headers/wscript_build (copied) (copied from vendor/current/testsuite/headers/wscript_build )
• testsuite/libsmbclient/src/Makefile (modified) (1 diff)
• testsuite/printing/psec.c (modified) (3 diffs)
• testsuite/smbd/se_access_check_utils.c (modified) (3 diffs)

trunk/server/testsuite/libsmbclient/src/Makefile

@@ -1 +1 @@
 CC      =       gcc
-CFLAGS  =       -Wall -W -O2 -g -I../../../source/include
-LFLAGS  =       -L../../../source/bin
-
-LIBS=   -L/usr/lib -lsmbclient -ltalloc
+CFLAGS  =       -Wall -W -O2 -g -I../../../source3/include
+LFLAGS  =       -L../../../source3/bin
+
+LIBS=   -L/usr/lib -lsmbclient -ltalloc -ltdb -lwbclient
 INCPATH= -I. -I/usr/include -I./include
 BIN_DIR=bin

trunk/server/testsuite/printing/psec.c

@@ -147 +147 @@
 {
         SEC_ACCESS sa;
-        DOM_SID sid;
+        struct dom_sid sid;
         uint32 mask;
         uint8 type, flags;
@@ -257 +257 @@
 int psec_setsec(char *printer)
 {
-        DOM_SID user_sid, group_sid;
+        struct dom_sid user_sid, group_sid;
         SEC_ACE *ace_list = NULL;
         SEC_ACL *dacl = NULL;
@@ -305 +305 @@
                 uint32 ace_mask;
                 fstring sidstr;
-                DOM_SID sid;
+                struct dom_sid sid;
                 SEC_ACCESS sa;
 

trunk/server/testsuite/smbd/se_access_check_utils.c

@@ -22 +22 @@
 #include "se_access_check_utils.h"
 
-void char_to_sid(DOM_SID *sid, char *sid_str)
+void char_to_sid(struct dom_sid *sid, char *sid_str)
 {
         /* If it looks like a SID, call string_to_sid() else look it up
@@ -66 +66 @@
         while(ace_list->sid) {
                 SEC_ACCESS sa;
-                DOM_SID sid;
+                struct dom_sid sid;
 
                 /* Create memory for new ACE */
@@ -100 +100 @@
                          char *owner_sid, char *group_sid)
 {
-        DOM_SID the_owner_sid, the_group_sid;
+        struct dom_sid the_owner_sid, the_group_sid;
         SEC_ACL *the_dacl, *the_sacl;
         SEC_DESC *result;