3 files changed, 1 insertions, 9 deletions
diff --git a/source3/include/local.h b/source3/include/local.h
index a55af443ec..0a369d80e2 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -85,11 +85,7 @@
 
 /* what type of filesystem do we want this to show up as in a NT file
    manager window? */
-#ifdef HAVE_NT_SMBS
-#define FSTYPE_STRING "NTFS"
-#else /* HAVE_NT_SMBS */
 #define FSTYPE_STRING "Samba"
-#endif /* HAVE_NT_SMBS */
 
 /* the default guest account - normally set in the Makefile or smb.conf */
 #ifndef GUEST_ACCOUNT
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8adfb70d38..2a7e5ed080 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1668,8 +1668,7 @@ user_struct *get_valid_user_struct(uint16 vuid);
 void invalidate_vuid(uint16 vuid);
 char *validated_username(uint16 vuid);
 int setup_groups(char *user, int uid, int gid, int *p_ngroups, 
-		 int **p_igroups, gid_t **p_groups,
-         int **p_attrs);
+		 int **p_igroups, gid_t **p_groups);
 uint16 register_vuid(int uid,int gid, char *unix_name, char *requested_name, BOOL guest);
 void add_session_user(char *user);
 BOOL update_smbpassword_file( char *user, fstring password);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 7079198a40..3b1796f76b 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -398,7 +398,6 @@ struct current_user
   int ngroups;
   gid_t *groups;
   int *igroups;
-  int *attrs;
 };
 
 typedef struct
@@ -510,7 +509,6 @@ typedef struct
   int ngroups;
   gid_t *groups;
   int *igroups; /* an integer version - some OSes are broken :-( */
-  int *attrs;
 
   time_t lastused;
   BOOL used;
@@ -548,7 +546,6 @@ typedef struct
   int n_groups;
   gid_t *groups;
   int *igroups; /* an integer version - some OSes are broken :-( */
-  int *attrs; /* attributes associated with each gid */
 
   int n_sids;
   int *sids;