Changeset 745 for trunk/server/lib/util/unix_privs.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)
• lib/util/unix_privs.c (modified) (2 diffs)

trunk/server/lib/util/unix_privs.c

@@ -21 +21 @@
 
 #include "includes.h"
-#include "system/filesys.h"
+#include "system/passwd.h"
 #include "../lib/util/unix_privs.h"
+
+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
 
 /**
@@ -77 +86 @@
         return s;
 }
+
+uid_t root_privileges_original_uid(void *s)
+{
+        struct saved_state *saved = talloc_get_type_abort(s, struct saved_state);
+        return saved->uid;
+}