svn commit: samba r15529 - branches/SAMBA_3_0/source/profile branches/SAMBA_3_0/source/utils trunk/source/profile trunk/source/utils

[jpeach at samba.org]

Author: jpeach
Date: 2006-05-10 22:33:10 +0000 (Wed, 10 May 2006)
New Revision: 15529

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

Log:
Initialise our saved uid and gid so that we can tell when
we created the profiling shmem segment and don't bogusly
refuse to look at it.

Modified:
   branches/SAMBA_3_0/source/profile/profile.c
   branches/SAMBA_3_0/source/utils/status.c
   trunk/source/profile/profile.c
   trunk/source/utils/status.c


Changeset:
Modified: branches/SAMBA_3_0/source/profile/profile.c
===================================================================
--- branches/SAMBA_3_0/source/profile/profile.c	2006-05-10 21:12:10 UTC (rev 15528)
+++ branches/SAMBA_3_0/source/profile/profile.c	2006-05-10 22:33:10 UTC (rev 15529)
@@ -158,8 +158,12 @@
 		return False;
 	}
 
-	if (shm_ds.shm_perm.cuid != sec_initial_uid() || shm_ds.shm_perm.cgid != sec_initial_gid()) {
-		DEBUG(0,("ERROR: we did not create the shmem (owned by another user)\n"));
+	if (shm_ds.shm_perm.cuid != sec_initial_uid() ||
+	    shm_ds.shm_perm.cgid != sec_initial_gid()) {
+		DEBUG(0,("ERROR: we did not create the shmem "
+			 "(owned by another user, uid %u, gid %u)\n",
+			 shm_ds.shm_perm.cuid,
+			 shm_ds.shm_perm.cgid));
 		return False;
 	}
 

Modified: branches/SAMBA_3_0/source/utils/status.c
===================================================================
--- branches/SAMBA_3_0/source/utils/status.c	2006-05-10 21:12:10 UTC (rev 15528)
+++ branches/SAMBA_3_0/source/utils/status.c	2006-05-10 22:33:10 UTC (rev 15529)
@@ -622,6 +622,7 @@
 		POPT_TABLEEND
 	};
 
+	sec_init();
 	load_case_tables();
 
 	setup_logging(argv[0],True);

Modified: trunk/source/profile/profile.c
===================================================================
--- trunk/source/profile/profile.c	2006-05-10 21:12:10 UTC (rev 15528)
+++ trunk/source/profile/profile.c	2006-05-10 22:33:10 UTC (rev 15529)
@@ -158,8 +158,12 @@
 		return False;
 	}
 
-	if (shm_ds.shm_perm.cuid != sec_initial_uid() || shm_ds.shm_perm.cgid != sec_initial_gid()) {
-		DEBUG(0,("ERROR: we did not create the shmem (owned by another user)\n"));
+	if (shm_ds.shm_perm.cuid != sec_initial_uid() ||
+	    shm_ds.shm_perm.cgid != sec_initial_gid()) {
+		DEBUG(0,("ERROR: we did not create the shmem "
+			 "(owned by another user, uid %u, gid %u)\n",
+			 shm_ds.shm_perm.cuid,
+			 shm_ds.shm_perm.cgid));
 		return False;
 	}
 

Modified: trunk/source/utils/status.c
===================================================================
--- trunk/source/utils/status.c	2006-05-10 21:12:10 UTC (rev 15528)
+++ trunk/source/utils/status.c	2006-05-10 22:33:10 UTC (rev 15529)
@@ -622,6 +622,7 @@
 		POPT_TABLEEND
 	};
 
+	sec_init();
 	load_case_tables();
 
 	setup_logging(argv[0],True);