From 78d7ba5ca021518ec5c088eb492b36710e556c31 Mon Sep 17 00:00:00 2001
From: Jean-François Micouleau <jfm@samba.org>
Date: Mon, 6 Mar 2000 11:13:40 +0000
Subject: changed prs_unistr to parse empty and non-empty strings the same way.
 fixed typo in SPOOLSS_SYNT some cleanup of unused functions wrote
 make_spoolss_enumprinter and make_spoolss_openprinterex for rpcclient as I'm
 trying to keep in sync the parsing code between HEAD and TNG.

Will commit changes to TNG after lunch.

	J.F.
(This used to be commit 025cdb345f6de287a41d4449b2662dbc5e762bf2)
---
 source3/lib/util.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'source3/lib/util.c')

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 564fc88222..772ac2f9ef 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2173,7 +2173,7 @@ void standard_sub_basic(char *str)
  Do some standard substitutions in a string.
 ****************************************************************************/
 
-void standard_sub(connection_struct *conn,char *str)
+void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str)
 {
 	char *p, *s, *home;
 
@@ -2181,29 +2181,27 @@ void standard_sub(connection_struct *conn,char *str)
 		int l = sizeof(pstring) - (int)(p-str);
 
 		switch (*(p+1)) {
-		case 'H': 
-			if ((home = get_user_home_dir(conn->user))) {
-				string_sub(p,"%H",home,l);
+		case 'H':
+			if ((home = get_user_home_dir(user))) {
+				string_sub(p,"%H",home, l);
 			} else {
 				p += 2;
 			}
 			break;
 			
 		case 'P': 
-			string_sub(p,"%P",conn->connectpath,l); 
+			string_sub(p,"%P", connectpath, l); 
 			break;
 			
 		case 'S': 
-			string_sub(p,"%S",
-				   lp_servicename(SNUM(conn)),l); 
+			string_sub(p,"%S", lp_servicename(snum), l); 
 			break;
 			
 		case 'g': 
-			string_sub(p,"%g",
-				   gidtoname(conn->gid),l); 
+			string_sub(p,"%g", gidtoname(gid), l); 
 			break;
 		case 'u': 
-			string_sub(p,"%u",conn->user,l); 
+			string_sub(p,"%u", user, l); 
 			break;
 			
 			/* Patch from jkf@soton.ac.uk Left the %N (NIS
@@ -2214,13 +2212,11 @@ void standard_sub(connection_struct *conn,char *str)
 			 * "path =" string in [homes] and so needs the
 			 * service name, not the username.  */
 		case 'p': 
-			string_sub(p,"%p",
-				   automount_path(lp_servicename(SNUM(conn))),l); 
+			string_sub(p,"%p", automount_path(lp_servicename(snum)), l); 
 			break;
 		case '\0': 
 			p++; 
-			break; /* don't run off the end of the string 
-				*/
+			break; /* don't run off the end of the string */
 			
 		default: p+=2; 
 			break;
@@ -2230,7 +2226,17 @@ void standard_sub(connection_struct *conn,char *str)
 	standard_sub_basic(str);
 }
 
+/****************************************************************************
+ Do some standard substitutions in a string.
+****************************************************************************/
 
+void standard_sub(connection_struct *conn, char *str)
+{
+	if (conn==NULL)
+		standard_sub_advanced(-1, "", "", -1, str);
+	else
+		standard_sub_advanced(SNUM(conn), conn->user, conn->connectpath, conn->gid, str);
+}
 
 /*******************************************************************
 are two IPs on the same subnet?
-- 
cgit