- use full_name instead of real_name

 - got rid of guest map code in lpq parser
(This used to be commit 8e53f781d3cf6a7007764916a0d8e8f1abea1f66)

8 files changed, 9 insertions, 21 deletions

diff --git a/source3/include/local.h b/source3/include/local.h
index 81212f9988..fbde799e5c 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -85,10 +85,6 @@
 /* this is where browse lists are kept in the lock dir */
 #define SERVER_LIST "browse.dat"
 
-/* shall guest entries in printer queues get changed to user entries,
-   so they can be deleted using the windows print manager? */
-#define LPQ_GUEST_TO_USER
-
 /* shall filenames with illegal chars in them get mangled in long
    filename listings? */
 #define MANGLE_LONG_FILENAMES 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index a03d7a0bcb..62cb8e55b4 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -606,7 +606,7 @@ struct dcinfo
 typedef struct {
 	fstring smb_name; /* user name from the client */
 	fstring unix_name; /* unix user name of a validated user */
-	fstring real_name; /* to store real name from password file - simeon */
+	fstring full_name; /* to store full name (such as "Joe Bloggs") from gecos field of password file */
 	fstring domain; /* domain that the client specified */
 } userdom_struct;
 
diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index ae8bb8398b..42da593c8d 100644
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -821,16 +821,6 @@ BOOL parse_lpq_entry(int snum,char *line,
       break;
     }
 
-#ifdef LPQ_GUEST_TO_USER
-  if (ret) {
-    extern pstring sesssetup_user;
-    /* change guest entries to the current logged in user to make
-       them appear deletable to windows */
-    if (sesssetup_user[0] && strequal(buf->user,lp_guestaccount(snum)))
-      pstrcpy(buf->user,sesssetup_user);
-  }
-#endif
-
   /* We don't want the newline in the status message. */
   {
     char *p = strchr(line,'\n');
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index 82573f7952..0821b671e5 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -808,7 +808,7 @@ static BOOL api_net_sam_logon(prs_struct *data, prs_struct *rdata)
                                 &dummy_time, /* pass_must_change_time */
                                 
                                 nt_username   , /* user_name */
-                                vuser->user.real_name, /* full_name */
+                                vuser->user.full_name, /* full_name */
                                 logon_script    , /* logon_script */
                                 profile_path    , /* profile_path */
                                 home_dir        , /* home_dir */
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 35fb0423a5..56b76d92be 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -121,7 +121,7 @@ static void attempt_remote_rpc_connect(pipes_struct *p)
 
 	/* set up unix credentials from the smb side, to feed over the pipe */
 	make_creds_unix(&usr.uxc, vuser->user.unix_name, vuser->user.smb_name,
-					vuser->user.real_name, vuser->guest);
+					vuser->user.full_name, vuser->guest);
 	usr.ptr_uxc = 1;
 	make_creds_unix_sec(&usr.uxs, vuser->uid, vuser->gid,
 					vuser->n_groups, vuser->groups);
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index db4cab662b..7284fb2389 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -1175,3 +1175,5 @@ BOOL api_spoolss_rpc(pipes_struct *p, prs_struct *data)
 {
 	return api_rpcTNP(p, "api_spoolss_rpc", api_spoolss_cmds, data);
 }
+
+
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 2ec08ddbf9..b986df6d07 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -2336,7 +2336,7 @@ static BOOL api_RNetUserGetInfo(connection_struct *conn,uint16 vuid, char *param
 
 		/* EEK! the cifsrap.txt doesn't have this in!!!! */
 		SIVAL(p,usri11_full_name,PTR_DIFF(p2,p)); /* full name */
-		pstrcpy(p2,((vuser != NULL) ? vuser->user.real_name : UserName));
+		pstrcpy(p2,((vuser != NULL) ? vuser->user.full_name : UserName));
 		p2 = skip_string(p2,1);
 	}
 
@@ -2395,7 +2395,7 @@ static BOOL api_RNetUserGetInfo(connection_struct *conn,uint16 vuid, char *param
 		{
 			SIVAL(p,60,0);		/* auth_flags */
 			SIVAL(p,64,PTR_DIFF(p2,*rdata)); /* full_name */
-   			pstrcpy(p2,((vuser != NULL) ? vuser->user.real_name : UserName));
+   			pstrcpy(p2,((vuser != NULL) ? vuser->user.full_name : UserName));
 			p2 = skip_string(p2,1);
 			SIVAL(p,68,0);		/* urs_comment */
 			SIVAL(p,72,PTR_DIFF(p2,*rdata)); /* parms */
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 989d3f045d..a727d2feb3 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -261,12 +261,12 @@ uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name,
   DEBUG(3,("uid %d registered to name %s\n",(int)uid,unix_name));
 
   DEBUG(3, ("Clearing default real name\n"));
-  fstrcpy(vuser->user.real_name, "<Full Name>");
+  fstrcpy(vuser->user.full_name, "<Full Name>");
   if (lp_unix_realname()) {
     if ((pwfile=sys_getpwnam(vuser->user.unix_name))!= NULL)
       {
       DEBUG(3, ("User name: %s\tReal name: %s\n",vuser->user.unix_name,pwfile->pw_gecos));
-      fstrcpy(vuser->user.real_name, pwfile->pw_gecos);
+      fstrcpy(vuser->user.full_name, pwfile->pw_gecos);
       }
   }