From: Michael Adam <obnox@samba.org>
Date: Wed, 23 Jun 2010 09:30:56 +0000 (+0200)
Subject: s3:idmap_tdb2: move idmap_tdb2_new_mapping() up. spare a prototype.
X-Git-Tag: release-4-0-0alpha13~1204
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=dac9f73ccd7041334308367a2f712df87173bb76

s3:idmap_tdb2: move idmap_tdb2_new_mapping() up. spare a prototype.
---

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index e80d21c9b89..520e1ebe1c1 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -46,10 +46,6 @@ struct idmap_tdb2_context {
 #define HWM_USER   "USER HWM"
 
 
-static NTSTATUS idmap_tdb2_new_mapping(struct idmap_domain *dom,
-				       struct id_map *map);
-
-
 /*
  * check and initialize high/low water marks in the db
  */
@@ -427,6 +423,57 @@ done:
 	return ret;
 }
 
+/**
+ * Create a new mapping for an unmapped SID, also allocating a new ID.
+ * This should be run inside a transaction.
+ *
+ * TODO:
+*  Properly integrate this with multi domain idmap config:
+ * Currently, the allocator is default-config only.
+ */
+static NTSTATUS idmap_tdb2_new_mapping(struct idmap_domain *dom, struct id_map *map)
+{
+	NTSTATUS ret;
+
+	if (map == NULL) {
+		ret = NT_STATUS_INVALID_PARAMETER;
+		goto done;
+	}
+
+	if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) {
+		ret = NT_STATUS_INVALID_PARAMETER;
+		goto done;
+	}
+
+	if (map->sid == NULL) {
+		ret = NT_STATUS_INVALID_PARAMETER;
+		goto done;
+	}
+
+	ret = idmap_tdb2_get_new_id(dom, &map->xid);
+	if (!NT_STATUS_IS_OK(ret)) {
+		DEBUG(3, ("Could not allocate id: %s\n", nt_errstr(ret)));
+		goto done;
+	}
+
+	DEBUG(10, ("Setting mapping: %s <-> %s %lu\n",
+		   sid_string_dbg(map->sid),
+		   (map->xid.type == ID_TYPE_UID) ? "UID" : "GID",
+		   (unsigned long)map->xid.id));
+
+	map->status = ID_MAPPED;
+
+	/* store the mapping */
+	ret = idmap_tdb2_set_mapping(dom, map);
+	if (!NT_STATUS_IS_OK(ret)) {
+		DEBUG(3, ("Could not store the new mapping: %s\n",
+			  nt_errstr(ret)));
+	}
+
+done:
+	return ret;
+}
+
 
 /*
   run a script to perform a mapping
@@ -837,57 +884,6 @@ static NTSTATUS idmap_tdb2_sids_to_unixids(struct idmap_domain *dom, struct id_m
 }
 
 
-/**
- * Create a new mapping for an unmapped SID, also allocating a new ID.
- * This should be run inside a transaction.
- *
- * TODO:
-*  Properly integrate this with multi domain idmap config:
- * Currently, the allocator is default-config only.
- */
-static NTSTATUS idmap_tdb2_new_mapping(struct idmap_domain *dom, struct id_map *map)
-{
-	NTSTATUS ret;
-
-	if (map == NULL) {
-		ret = NT_STATUS_INVALID_PARAMETER;
-		goto done;
-	}
-
-	if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) {
-		ret = NT_STATUS_INVALID_PARAMETER;
-		goto done;
-	}
-
-	if (map->sid == NULL) {
-		ret = NT_STATUS_INVALID_PARAMETER;
-		goto done;
-	}
-
-	ret = idmap_tdb2_get_new_id(dom, &map->xid);
-	if (!NT_STATUS_IS_OK(ret)) {
-		DEBUG(3, ("Could not allocate id: %s\n", nt_errstr(ret)));
-		goto done;
-	}
-
-	DEBUG(10, ("Setting mapping: %s <-> %s %lu\n",
-		   sid_string_dbg(map->sid),
-		   (map->xid.type == ID_TYPE_UID) ? "UID" : "GID",
-		   (unsigned long)map->xid.id));
-
-	map->status = ID_MAPPED;
-
-	/* store the mapping */
-	ret = idmap_tdb2_set_mapping(dom, map);
-	if (!NT_STATUS_IS_OK(ret)) {
-		DEBUG(3, ("Could not store the new mapping: %s\n",
-			  nt_errstr(ret)));
-	}
-
-done:
-	return ret;
-}
-
 /*
   Close the idmap tdb instance
 */