Changeset 745 for trunk/server/source3/passdb/pdb_compat.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/passdb/pdb_compat.c (modified) (7 diffs)

trunk/server/source3/passdb/pdb_compat.c

@@ -7 +7 @@
    Copyright (C) Andrew Bartlett                2001-2002
    Copyright (C) Stefan (metze) Metzmacher      2002
-      
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -23 +23 @@
 
 #include "includes.h"
+#include "passdb.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
@@ -34 +36 @@
                 if (sid_peek_check_rid(get_global_sam_sid(), pdb_get_user_sid(sampass),&u_rid))
                         return u_rid;
-        
+
         return (0);
 }
@@ -50 +52 @@
 bool pdb_set_user_sid_from_rid (struct samu *sampass, uint32 rid, enum pdb_value_state flag)
 {
-        DOM_SID u_sid;
-        const DOM_SID *global_sam_sid;
-        
+        struct dom_sid u_sid;
+        const struct dom_sid *global_sam_sid;
+
         if (!sampass)
                 return False;
@@ -61 +63 @@
         }
 
-        sid_copy(&u_sid, global_sam_sid);
-
-        if (!sid_append_rid(&u_sid, rid))
+        if (!sid_compose(&u_sid, global_sam_sid, rid)) {
                 return False;
+        }
 
         if (!pdb_set_user_sid(sampass, &u_sid, flag))
@@ -77 +78 @@
 bool pdb_set_group_sid_from_rid (struct samu *sampass, uint32 grid, enum pdb_value_state flag)
 {
-        DOM_SID g_sid;
-        const DOM_SID *global_sam_sid;
+        struct dom_sid g_sid;
+        const struct dom_sid *global_sam_sid;
 
         if (!sampass)
                 return False;
-        
+
         if (!(global_sam_sid = get_global_sam_sid())) {
                 DEBUG(1, ("pdb_set_user_sid_from_rid: Could not read global sam sid!\n"));
@@ -88 +89 @@
         }
 
-        sid_copy(&g_sid, global_sam_sid);
-        
-        if (!sid_append_rid(&g_sid, grid))
+        if (!sid_compose(&g_sid, global_sam_sid, grid)) {
                 return False;
+        }
 
         if (!pdb_set_group_sid(sampass, &g_sid, flag))