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

trunk/server/source3/winbindd/idmap_passdb.c

@@ -5 +5 @@
 
    Copyright (C) Simo Sorce 2006
-   
+
    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/>.
@@ -21 +21 @@
 
 #include "includes.h"
+#include "idmap.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
@@ -29 +31 @@
 *****************************/
 
-static NTSTATUS idmap_pdb_init(struct idmap_domain *dom, const char *params)
+static NTSTATUS idmap_pdb_init(struct idmap_domain *dom)
 {       
         return NT_STATUS_OK;
@@ -77 +79 @@
                 enum lsa_SidType type;
                 union unid_t id;
-                
+
                 if (pdb_sid_to_id(ids[i]->sid, &id, &type)) {
                         switch (type) {
@@ -112 +114 @@
 **********************************/
 
-static NTSTATUS idmap_pdb_close(struct idmap_domain *dom)
-{
-        return NT_STATUS_OK;
-}
-
 static struct idmap_methods passdb_methods = {
 
@@ -122 +119 @@
         .unixids_to_sids = idmap_pdb_unixids_to_sids,
         .sids_to_unixids = idmap_pdb_sids_to_unixids,
-        .close_fn =idmap_pdb_close
 };