svn commit: samba r23613 - in branches/SAMBA_3_0_RELEASE: . source/utils

[jerry at samba.org]

Author: jerry
Date: 2007-06-26 19:23:07 +0000 (Tue, 26 Jun 2007)
New Revision: 23613

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23613

Log:
pull in net idmap change from the 3.0.25 tree
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2007-06-26 19:15:26 UTC (rev 23612)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2007-06-26 19:23:07 UTC (rev 23613)
@@ -76,8 +76,10 @@
 o   Volker Lendecke <vl at samba.org>
     * Fix record state check error when reviewing entries in nmbd's
       WINS database.
+    * Revert 'net idmap dump' behavior to 3.0.24 behavior to fix change 
+      in command line syntax that would overwrite winbindd_idmap.tdb.
+      
 
-
 o   Justin Maggard <jmaggard at infrant.com>
     * Don't expire a password if it's explicitly set as ACB_PWNOTREQ.
 

Modified: branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c	2007-06-26 19:15:26 UTC (rev 23612)
+++ branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c	2007-06-26 19:23:07 UTC (rev 23613)
@@ -28,50 +28,51 @@
 	} } while(0)
 
 /***********************************************************
- Dump the current idmap
+ Helper function for net_idmap_dump. Dump one entry.
  **********************************************************/
-static int net_idmap_dump(int argc, const char **argv)
+static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
+				    TDB_DATA key,
+				    TDB_DATA data,
+				    void *unused)
 {
-	TALLOC_CTX *ctx;
-	char *filename;
-
-	if (argc != 1) {
-		return net_help_idmap(argc, argv);
+	if (strcmp(key.dptr, "USER HWM") == 0) {
+		printf("USER HWM %d\n", IVAL(data.dptr,0));
+		return 0;
 	}
 
-	if (! winbind_ping()) {
-		d_fprintf(stderr, "To use net idmap Winbindd must be running.\n");
-		return -1;
+	if (strcmp(key.dptr, "GROUP HWM") == 0) {
+		printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+		return 0;
 	}
 
-	ctx = talloc_new(NULL);
-	ALLOC_CHECK(ctx);
+	if (strncmp(key.dptr, "S-", 2) != 0)
+		return 0;
 
-	filename = talloc_strdup(ctx, argv[0]);
-	ALLOC_CHECK(filename);
+	printf("%s %s\n", data.dptr, key.dptr);
+	return 0;
+}
 
-	/* filename must be absolute */
-	if (*filename != '/') {
-		char path[4096];
-		
-		filename = getcwd(path, 4095);
-		if ( ! filename) {
-			d_fprintf(stderr, "Failed to obtain full output file path");
-			talloc_free(ctx);
-			return -1;
-		}
+/***********************************************************
+ Dump the current idmap
+ **********************************************************/
+static int net_idmap_dump(int argc, const char **argv)
+{
+	TDB_CONTEXT *idmap_tdb;
 
-		filename = talloc_asprintf(ctx, "%s/%s", path, argv[0]);
-		ALLOC_CHECK(filename);
-	}
+	if ( argc != 1 )
+		return net_help_idmap( argc, argv );
 
-	if ( ! winbind_idmap_dump_maps(ctx, filename)) {
-		d_fprintf(stderr, "Failed to obtain idmap data from winbindd\n");
-		talloc_free(ctx);
+	idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+
+	if (idmap_tdb == NULL) {
+		d_fprintf(stderr, "Could not open idmap: %s\n", argv[0]);
 		return -1;
 	}
 
-	talloc_free(ctx);
+	tdb_traverse(idmap_tdb, net_idmap_dump_one_entry, NULL);
+
+	tdb_close(idmap_tdb);
+
 	return 0;
 }