3 files changed, 7 insertions, 11 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3887d96589..a5da95cd7d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3304,8 +3304,7 @@ char *validated_domain(uint16 vuid);
 int setup_groups(char *user, char *domain, 
 		 uid_t uid, gid_t gid, int *p_ngroups, gid_t **p_groups);
 uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name, 
-		     char *domain,BOOL guest,
-		     NET_USER_INFO_3 *usr);
+		     char *domain,BOOL guest);
 void add_session_user(char *user);
 BOOL smb_password_check(char *password, unsigned char *part_passwd, unsigned char *c8);
 BOOL smb_password_ok(struct smb_passwd *smb_pass, uchar chal[8],
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 0efced2e38..91f0e04b48 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1696,7 +1696,12 @@ typedef struct
 	int n_groups;
 	gid_t *groups;
 
-	NET_USER_INFO_3 usr;
+#if 0
+	NET_USER_INFO_3 usr; /* This should not be here. */
+#else
+	DOM_SID user_sid;
+	DOM_SID *group_sids;
+#endif
 
 	/* per-user authentication information on NT RPCs */
 	/* lkclXXXX - THIS SHOULD NOT BE HERE! */
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 267b061f65..51c7c1c638 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -42,14 +42,6 @@
 #define IS_DOS_SYSTEM(test_mode)   (((test_mode) & aSYSTEM) != 0)
 #define IS_DOS_HIDDEN(test_mode)   (((test_mode) & aHIDDEN) != 0)
 
-/* memory-allocation-helpers (idea and names from glib) */
-#define g_new(type, count) \
-	((type *) malloc(sizeof(type) * (count)))
-#define g_new0(type, count) \
-	((type *) calloc((count), sizeof(type)))
-#define g_renew(type, mem, count) \
-	((type *) Realloc(mem, sizeof(type) * (count)))
-
 /* zero a structure */
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))