-/*
+/*
Unix SMB/CIFS implementation.
string substitution functions
Copyright (C) Andrew Tridgell 1992-2000
#include "includes.h"
+#include "substitute.h"
+#include "system/passwd.h"
+#include "secrets.h"
+#include "auth.h"
+#include "lib/util/string_wrappers.h"
+
+/* Max DNS name is 253 + '\0' */
+#define MACHINE_NAME_SIZE 254
-static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
- const char *str);
+static char local_machine[MACHINE_NAME_SIZE];
+static char remote_machine[MACHINE_NAME_SIZE];
userdom_struct current_user_info;
-fstring remote_proto="UNKNOWN";
+static fstring remote_proto="UNKNOWN";
+
+void set_remote_proto(const char *proto)
+{
+ fstrcpy(remote_proto, proto);
+}
/**
* Set the 'local' machine name
* @param local_name the name we are being called
* @param if this is the 'final' name for us, not be be changed again
*/
-
-static char *local_machine;
-
-void free_local_machine_name(void)
-{
- SAFE_FREE(local_machine);
-}
-
bool set_local_machine_name(const char *local_name, bool perm)
{
static bool already_perm = false;
- char *tmp_local_machine = NULL;
- char addr[INET6_ADDRSTRLEN];
- size_t len;
-
- tmp_local_machine = SMB_STRDUP(local_name);
- if (!tmp_local_machine) {
- return false;
- }
- trim_char(tmp_local_machine,' ',' ');
-
- /*
- * Windows NT/2k uses "*SMBSERVER" and XP uses "*SMBSERV"
- * arrggg!!!
- */
-
- if (strequal(tmp_local_machine, "*SMBSERVER") ||
- strequal(tmp_local_machine, "*SMBSERV") ) {
- SAFE_FREE(local_machine);
- local_machine = SMB_STRDUP(client_socket_addr(get_client_fd(),
- addr, sizeof(addr)) );
- SAFE_FREE(tmp_local_machine);
- return local_machine ? true : false;
- }
+ char tmp[MACHINE_NAME_SIZE];
if (already_perm) {
return true;
}
- SAFE_FREE(local_machine);
- len = strlen(tmp_local_machine);
- local_machine = SMB_CALLOC_ARRAY(char, len+1);
- if (!local_machine) {
- SAFE_FREE(tmp_local_machine);
+ strlcpy(tmp, local_name, sizeof(tmp));
+ trim_char(tmp, ' ', ' ');
+
+ alpha_strcpy(local_machine,
+ tmp,
+ SAFE_NETBIOS_CHARS,
+ sizeof(local_machine) - 1);
+ if (!strlower_m(local_machine)) {
return false;
}
- /* alpha_strcpy includes the space for the terminating nul. */
- alpha_strcpy(local_machine,tmp_local_machine,
- SAFE_NETBIOS_CHARS,len+1);
- strlower_m(local_machine);
- SAFE_FREE(tmp_local_machine);
already_perm = perm;
const char *get_local_machine_name(void)
{
- if (!local_machine || !*local_machine) {
- return global_myname();
+ if (local_machine[0] == '\0') {
+ return lp_netbios_name();
}
return local_machine;
/**
* Set the 'remote' machine name
+ *
* @param remote_name the name our client wants to be called by
* @param if this is the 'final' name for them, not be be changed again
*/
-
-static char *remote_machine;
-
bool set_remote_machine_name(const char *remote_name, bool perm)
{
static bool already_perm = False;
- char *tmp_remote_machine;
- size_t len;
+ char tmp[MACHINE_NAME_SIZE];
if (already_perm) {
return true;
}
- tmp_remote_machine = SMB_STRDUP(remote_name);
- if (!tmp_remote_machine) {
- return false;
- }
- trim_char(tmp_remote_machine,' ',' ');
+ strlcpy(tmp, remote_name, sizeof(tmp));
+ trim_char(tmp, ' ', ' ');
- SAFE_FREE(remote_machine);
- len = strlen(tmp_remote_machine);
- remote_machine = SMB_CALLOC_ARRAY(char, len+1);
- if (!remote_machine) {
- SAFE_FREE(tmp_remote_machine);
+ alpha_strcpy(remote_machine,
+ tmp,
+ SAFE_NETBIOS_CHARS,
+ sizeof(remote_machine) - 1);
+ if (!strlower_m(remote_machine)) {
return false;
}
- /* alpha_strcpy includes the space for the terminating nul. */
- alpha_strcpy(remote_machine,tmp_remote_machine,
- SAFE_NETBIOS_CHARS,len+1);
- strlower_m(remote_machine);
- SAFE_FREE(tmp_remote_machine);
-
already_perm = perm;
return true;
const char *get_remote_machine_name(void)
{
- return remote_machine ? remote_machine : "";
+ return remote_machine;
}
-/*******************************************************************
- Setup the string used by %U substitution.
-********************************************************************/
+static char sub_peeraddr[INET6_ADDRSTRLEN];
+static const char *sub_peername = NULL;
+static char sub_sockaddr[INET6_ADDRSTRLEN];
-static char *smb_user_name;
-
-void sub_set_smb_name(const char *name)
+void sub_set_socket_ids(const char *peeraddr, const char *peername,
+ const char *sockaddr)
{
- char *tmp;
- size_t len;
- bool is_machine_account = false;
-
- /* don't let anonymous logins override the name */
- if (!name || !*name) {
- return;
- }
-
- tmp = SMB_STRDUP(name);
- if (!tmp) {
- return;
- }
- trim_char(tmp, ' ', ' ');
- strlower_m(tmp);
-
- len = strlen(tmp);
-
- if (len == 0) {
- SAFE_FREE(tmp);
- return;
- }
-
- /* long story but here goes....we have to allow usernames
- ending in '$' as they are valid machine account names.
- So check for a machine account and re-add the '$'
- at the end after the call to alpha_strcpy(). --jerry */
+ const char *addr = peeraddr;
- if (tmp[len-1] == '$') {
- is_machine_account = True;
+ if (strnequal(addr, "::ffff:", 7)) {
+ addr += 7;
}
+ strlcpy(sub_peeraddr, addr, sizeof(sub_peeraddr));
- SAFE_FREE(smb_user_name);
- smb_user_name = SMB_CALLOC_ARRAY(char, len+1);
- if (!smb_user_name) {
- SAFE_FREE(tmp);
- return;
+ if (sub_peername != NULL &&
+ sub_peername != sub_peeraddr) {
+ talloc_free(discard_const_p(char,sub_peername));
+ sub_peername = NULL;
}
-
- /* alpha_strcpy includes the space for the terminating nul. */
- alpha_strcpy(smb_user_name, tmp,
- SAFE_NETBIOS_CHARS,
- len+1);
-
- SAFE_FREE(tmp);
-
- if (is_machine_account) {
- len = strlen(smb_user_name);
- smb_user_name[len-1] = '$';
+ sub_peername = talloc_strdup(NULL, peername);
+ if (sub_peername == NULL) {
+ sub_peername = sub_peeraddr;
}
-}
-static const char *get_smb_user_name(void)
-{
- return smb_user_name ? smb_user_name : "";
+ /*
+ * Shouldn't we do the ::ffff: cancellation here as well? The
+ * original code in talloc_sub_basic() did not do it, so I'm
+ * leaving it out here as well for compatibility.
+ */
+ strlcpy(sub_sockaddr, sockaddr, sizeof(sub_sockaddr));
}
/*******************************************************************
void set_current_user_info(const char *smb_name, const char *unix_name,
const char *domain)
{
+ static const void *last_smb_name;
+ static const void *last_unix_name;
+ static const void *last_domain;
+
+ if (likely(last_smb_name == smb_name &&
+ last_unix_name == unix_name &&
+ last_domain == domain))
+ {
+ return;
+ }
+
fstrcpy(current_user_info.smb_name, smb_name);
fstrcpy(current_user_info.unix_name, unix_name);
fstrcpy(current_user_info.domain, domain);
- /* The following is safe as current_user_info.smb_name
- * has already been sanitised in register_existing_vuid. */
-
- sub_set_smb_name(current_user_info.smb_name);
+ last_smb_name = smb_name;
+ last_unix_name = unix_name;
+ last_domain = domain;
}
/*******************************************************************
const char *get_current_username(void)
{
- if (current_user_info.smb_name[0] == '\0' ) {
- return get_smb_user_name();
- }
-
return current_user_info.smb_name;
}
+const char *get_current_user_info_domain(void)
+{
+ return current_user_info.domain;
+}
+
/*******************************************************************
Given a pointer to a %$(NAME) in p and the whole string in str
expand it as an environment variable.
+ str must be a talloced string.
Return a new allocated and expanded string.
Based on code by Branko Cibej <branko.cibej@hermes.si>
When this is called p points at the '%' character.
- May substitute multiple occurrencies of the same env var.
+ May substitute multiple occurrences of the same env var.
********************************************************************/
-static char * realloc_expand_env_var(char *str, char *p)
+static char *realloc_expand_env_var(char *str, char *p)
{
char *envname;
char *envval;
copylen = q - r;
/* reserve space for use later add %$() chars */
- if ( (envname = (char *)SMB_MALLOC(copylen + 1 + 4)) == NULL ) {
+ if ( (envname = talloc_array(talloc_tos(), char, copylen + 1 + 4)) == NULL ) {
return NULL;
}
if ((envval = getenv(envname)) == NULL) {
DEBUG(0,("expand_env_var: Environment variable [%s] not set\n", envname));
- SAFE_FREE(envname);
+ TALLOC_FREE(envname);
return str;
}
strncpy(envname,p,copylen);
envname[copylen] = '\0';
r = realloc_string_sub(str, envname, envval);
- SAFE_FREE(envname);
-
- return r;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-static char *longvar_domainsid( void )
-{
- struct dom_sid sid;
- fstring tmp;
- char *sid_string;
-
- if ( !secrets_fetch_domain_sid( lp_workgroup(), &sid ) ) {
- return NULL;
- }
-
- sid_string = SMB_STRDUP( sid_to_fstring( tmp, &sid ) );
-
- if ( !sid_string ) {
- DEBUG(0,("longvar_domainsid: failed to dup SID string!\n"));
- }
-
- return sid_string;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-struct api_longvar {
- const char *name;
- char* (*fn)( void );
-};
-
-static struct api_longvar longvar_table[] = {
- { "DomainSID", longvar_domainsid },
- { NULL, NULL }
-};
-
-static char *get_longvar_val( const char *varname )
-{
- int i;
-
- DEBUG(7,("get_longvar_val: expanding variable [%s]\n", varname));
-
- for ( i=0; longvar_table[i].name; i++ ) {
- if ( strequal( longvar_table[i].name, varname ) ) {
- return longvar_table[i].fn();
- }
- }
-
- return NULL;
-}
-
-/*******************************************************************
- Expand the long smb.conf variable names given a pointer to a %(NAME).
- Return the number of characters by which the pointer should be advanced.
- When this is called p points at the '%' character.
-********************************************************************/
-
-static char *realloc_expand_longvar(char *str, char *p)
-{
- fstring varname;
- char *value;
- char *q, *r;
- int copylen;
-
- if ( p[0] != '%' || p[1] != '(' ) {
- return str;
- }
-
- /* Look for the terminating ')'.*/
-
- if ((q = strchr_m(p,')')) == NULL) {
- DEBUG(0,("realloc_expand_longvar: Unterminated environment variable [%s]\n", p));
- return str;
- }
-
- /* Extract the name from within the %(NAME) string.*/
-
- r = p+2;
- copylen = MIN( (q-r), (sizeof(varname)-1) );
- strncpy(varname, r, copylen);
- varname[copylen] = '\0';
-
- if ((value = get_longvar_val(varname)) == NULL) {
- DEBUG(0,("realloc_expand_longvar: Variable [%s] not set. Skipping\n", varname));
- return str;
- }
-
- /* Copy the full %(NAME) into envname so it can be replaced.*/
-
- copylen = MIN( (q+1-p),(sizeof(varname)-1) );
- strncpy( varname, p, copylen );
- varname[copylen] = '\0';
- r = realloc_string_sub(str, varname, value);
- SAFE_FREE( value );
-
- /* skip over the %(varname) */
+ TALLOC_FREE(envname);
return r;
}
-/*******************************************************************
- Patch from jkf@soton.ac.uk
- Added this to implement %p (NIS auto-map version of %H)
-*******************************************************************/
-
-static const char *automount_path(const char *user_name)
-{
- TALLOC_CTX *ctx = talloc_tos();
- const char *server_path;
-
- /* use the passwd entry as the default */
- /* this will be the default if WITH_AUTOMOUNT is not used or fails */
-
- server_path = talloc_strdup(ctx, get_user_home_dir(ctx, user_name));
- if (!server_path) {
- return "";
- }
-
-#if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
-
- if (lp_nis_home_map()) {
- const char *home_path_start;
- char *automount_value = automount_lookup(ctx, user_name);
-
- if(automount_value && strlen(automount_value) > 0) {
- home_path_start = strchr_m(automount_value,':');
- if (home_path_start != NULL) {
- DEBUG(5, ("NIS lookup succeeded. "
- "Home path is: %s\n",
- home_path_start ?
- (home_path_start+1):""));
- server_path = talloc_strdup(ctx,
- home_path_start+1);
- if (!server_path) {
- server_path = "";
- }
- }
- } else {
- /* NIS key lookup failed: default to
- * user home directory from password file */
- DEBUG(5, ("NIS lookup failed. Using Home path from "
- "passwd file. Home path is: %s\n", server_path ));
- }
- }
-#endif
-
- DEBUG(4,("Home server path: %s\n", server_path));
- return server_path;
-}
-
-/*******************************************************************
- Patch from jkf@soton.ac.uk
- This is Luke's original function with the NIS lookup code
- moved out to a separate function.
-*******************************************************************/
-
-static const char *automount_server(const char *user_name)
-{
- TALLOC_CTX *ctx = talloc_tos();
- const char *server_name;
- const char *local_machine_name = get_local_machine_name();
-
- /* use the local machine name as the default */
- /* this will be the default if WITH_AUTOMOUNT is not used or fails */
- if (local_machine_name && *local_machine_name) {
- server_name = talloc_strdup(ctx, local_machine_name);
- } else {
- server_name = talloc_strdup(ctx, global_myname());
- }
-
- if (!server_name) {
- return "";
- }
-
-#if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
- if (lp_nis_home_map()) {
- char *p;
- char *srv;
- char *automount_value = automount_lookup(ctx, user_name);
- if (!automount_value) {
- return "";
- }
- srv = talloc_strdup(ctx, automount_value);
- if (!srv) {
- return "";
- }
- p = strchr_m(srv, ':');
- if (!p) {
- return "";
- }
- *p = '\0';
- server_name = srv;
- DEBUG(5, ("NIS lookup succeeded. Home server %s\n",
- server_name));
- }
-#endif
-
- DEBUG(4,("Home server: %s\n", server_name));
- return server_name;
-}
-
/****************************************************************************
Do some standard substitutions in a string.
len is the length in bytes of the space allowed in string str. If zero means
{
char *s;
- if ( (s = alloc_sub_basic( smb_name, domain_name, str )) != NULL ) {
+ if ( (s = talloc_sub_basic(talloc_tos(), smb_name, domain_name, str )) != NULL ) {
strncpy( str, s, len );
}
- SAFE_FREE( s );
+ TALLOC_FREE( s );
}
-/****************************************************************************
- Do some standard substitutions in a string.
- This function will return an allocated string that have to be freed.
-****************************************************************************/
-
-char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name,
- const char *domain_name, const char *str)
+/*
+ * Limit addresses to hexalpha characters and underscore, safe for path
+ * components for Windows clients.
+ */
+static void make_address_pathsafe(char *addr)
{
- char *a, *t;
-
- if ( (a = alloc_sub_basic(smb_name, domain_name, str)) == NULL ) {
- return NULL;
+ while(addr && *addr) {
+ if(!isxdigit(*addr)) {
+ *addr = '_';
+ }
+ ++addr;
}
- t = talloc_strdup(mem_ctx, a);
- SAFE_FREE(a);
- return t;
}
/****************************************************************************
+ Do some standard substitutions in a string.
+ This function will return a talloced string that has to be freed.
****************************************************************************/
-static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
- const char *str)
+char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
+ const char *smb_name,
+ const char *domain_name,
+ const char *str)
{
char *b, *p, *s, *r, *a_string;
fstring pidstr, vnnstr;
- char addr[INET6_ADDRSTRLEN];
const char *local_machine_name = get_local_machine_name();
TALLOC_CTX *tmp_ctx = NULL;
/* workaround to prevent a crash while looking at bug #687 */
if (!str) {
- DEBUG(0,("alloc_sub_basic: NULL source string! This should not happen\n"));
+ DEBUG(0,("talloc_sub_basic: NULL source string! This should not happen\n"));
return NULL;
}
- a_string = SMB_STRDUP(str);
+ a_string = talloc_strdup(mem_ctx, str);
if (a_string == NULL) {
- DEBUG(0, ("alloc_sub_basic: Out of memory!\n"));
+ DEBUG(0, ("talloc_sub_basic: Out of memory!\n"));
return NULL;
}
tmp_ctx = talloc_stackframe();
- for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
+ for (s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
r = NULL;
b = a_string;
switch (*(p+1)) {
- case 'U' :
+ case 'U' :
r = strlower_talloc(tmp_ctx, smb_name);
if (r == NULL) {
goto error;
break;
case 'G' : {
struct passwd *pass;
- r = talloc_strdup(tmp_ctx, smb_name);
+ bool is_domain_name = false;
+ const char *sep = lp_winbind_separator();
+
+ if (domain_name != NULL && domain_name[0] != '\0' &&
+ (lp_security() == SEC_ADS ||
+ lp_security() == SEC_DOMAIN)) {
+ r = talloc_asprintf(tmp_ctx,
+ "%s%c%s",
+ domain_name,
+ *sep,
+ smb_name);
+ is_domain_name = true;
+ } else {
+ r = talloc_strdup(tmp_ctx, smb_name);
+ }
if (r == NULL) {
goto error;
}
+
pass = Get_Pwnam_alloc(tmp_ctx, r);
if (pass != NULL) {
- a_string = realloc_string_sub(
- a_string, "%G",
- gidtoname(pass->pw_gid));
+ char *group_name;
+
+ group_name = gidtoname(pass->pw_gid);
+ if (is_domain_name) {
+ char *group_sep;
+ group_sep = strchr_m(group_name, *sep);
+ if (group_sep != NULL) {
+ group_name = group_sep + 1;
+ }
+ }
+ a_string = realloc_string_sub(a_string,
+ "%G",
+ group_name);
}
TALLOC_FREE(pass);
break;
a_string = realloc_string_sub(a_string, "%D", r);
break;
case 'I' : {
- int offset = 0;
- client_addr(get_client_fd(), addr, sizeof(addr));
- if (strnequal(addr,"::ffff:",7)) {
- offset = 7;
- }
- a_string = realloc_string_sub(a_string, "%I",
- addr + offset);
+ a_string = realloc_string_sub(
+ a_string, "%I",
+ sub_peeraddr[0] ? sub_peeraddr : "0.0.0.0");
break;
}
- case 'i':
- a_string = realloc_string_sub( a_string, "%i",
- client_socket_addr(get_client_fd(), addr, sizeof(addr)) );
+ case 'J' : {
+ r = talloc_strdup(tmp_ctx,
+ sub_peeraddr[0] ? sub_peeraddr : "0.0.0.0");
+ make_address_pathsafe(r);
+ a_string = realloc_string_sub(a_string, "%J", r);
break;
- case 'L' :
- if ( StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) {
+ }
+ case 'i':
+ a_string = realloc_string_sub(
+ a_string, "%i",
+ sub_sockaddr[0] ? sub_sockaddr : "0.0.0.0");
+ break;
+ case 'j' : {
+ r = talloc_strdup(tmp_ctx,
+ sub_sockaddr[0] ? sub_sockaddr : "0.0.0.0");
+ make_address_pathsafe(r);
+ a_string = realloc_string_sub(a_string, "%j", r);
+ break;
+ }
+ case 'L' :
+ if ( strncasecmp_m(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) {
break;
}
if (local_machine_name && *local_machine_name) {
- a_string = realloc_string_sub(a_string, "%L", local_machine_name);
+ a_string = realloc_string_sub(a_string, "%L", local_machine_name);
} else {
- a_string = realloc_string_sub(a_string, "%L", global_myname());
+ a_string = realloc_string_sub(a_string, "%L", lp_netbios_name());
}
break;
- case 'N':
- a_string = realloc_string_sub(a_string, "%N", automount_server(smb_name));
+ case 'N' :
+ a_string = realloc_string_sub(a_string,
+ "%N",
+ lp_netbios_name());
break;
case 'M' :
- a_string = realloc_string_sub(a_string, "%M", client_name(get_client_fd()));
+ a_string = realloc_string_sub(a_string, "%M",
+ sub_peername ? sub_peername : "");
break;
case 'R' :
a_string = realloc_string_sub(a_string, "%R", remote_proto);
case 'T' :
a_string = realloc_string_sub(a_string, "%T", current_timestring(tmp_ctx, False));
break;
+ case 't' :
+ a_string = realloc_string_sub(a_string, "%t",
+ current_minimal_timestring(tmp_ctx, False));
+ break;
case 'a' :
a_string = realloc_string_sub(a_string, "%a",
get_remote_arch_str());
break;
case 'd' :
- slprintf(pidstr,sizeof(pidstr)-1, "%d",(int)sys_getpid());
+ slprintf(pidstr,sizeof(pidstr)-1, "%d",(int)getpid());
a_string = realloc_string_sub(a_string, "%d", pidstr);
break;
case 'h' :
break;
case 'm' :
a_string = realloc_string_sub(a_string, "%m",
- remote_machine
- ? remote_machine
- : "");
+ remote_machine);
break;
case 'v' :
a_string = realloc_string_sub(a_string, "%v", samba_version_string());
case '$' :
a_string = realloc_expand_env_var(a_string, p); /* Expand environment variables */
break;
- case '(':
- a_string = realloc_expand_longvar( a_string, p );
- break;
case 'V' :
slprintf(vnnstr,sizeof(vnnstr)-1, "%u", get_my_vnn());
a_string = realloc_string_sub(a_string, "%V", vnnstr);
break;
- default:
+ default:
break;
}
goto done;
error:
- SAFE_FREE(a_string);
+ TALLOC_FREE(a_string);
done:
TALLOC_FREE(tmp_ctx);
char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
const char *input_string,
const char *username,
+ const char *grpname,
const char *domain,
uid_t uid,
gid_t gid)
goto done;
}
- for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
+ for (s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
b = a_string;
switch (*(p+1)) {
- case 'U' :
+ case 'U' :
a_string = talloc_string_sub(
tmp_ctx, a_string, "%U", username);
break;
- case 'u' :
+ case 'u' :
a_string = talloc_string_sub(
tmp_ctx, a_string, "%u", username);
break;
case 'G' :
if (gid != -1) {
- a_string = talloc_string_sub(
- tmp_ctx, a_string, "%G",
- gidtoname(gid));
+ const char *name;
+
+ if (grpname != NULL) {
+ name = grpname;
+ } else {
+ name = gidtoname(gid);
+ }
+
+ a_string = talloc_string_sub(tmp_ctx,
+ a_string,
+ "%G",
+ name);
} else {
a_string = talloc_string_sub(
tmp_ctx, a_string,
break;
case 'g' :
if (gid != -1) {
- a_string = talloc_string_sub(
- tmp_ctx, a_string, "%g",
- gidtoname(gid));
+ const char *name;
+
+ if (grpname != NULL) {
+ name = grpname;
+ } else {
+ name = gidtoname(gid);
+ }
+
+ a_string = talloc_string_sub(tmp_ctx,
+ a_string,
+ "%g",
+ name);
} else {
a_string = talloc_string_sub(
tmp_ctx, a_string, "%g", "NO_GROUP");
a_string = talloc_string_sub(tmp_ctx, a_string,
"%D", domain);
break;
- case 'N' :
- a_string = talloc_string_sub(
- tmp_ctx, a_string, "%N",
- automount_server(username));
+ case 'N' :
+ a_string = talloc_string_sub(tmp_ctx, a_string,
+ "%N", lp_netbios_name());
break;
- default:
+ default:
break;
}
/****************************************************************************
****************************************************************************/
-static char *alloc_sub_advanced(const char *servicename, const char *user,
- const char *connectpath, gid_t gid,
- const char *smb_name, const char *domain_name,
- const char *str)
+char *talloc_sub_advanced(TALLOC_CTX *ctx,
+ const char *servicename,
+ const char *user,
+ const char *connectpath,
+ gid_t gid,
+ const char *str)
{
- char *a_string, *ret_string;
+ char *a_string;
char *b, *p, *s;
- a_string = SMB_STRDUP(str);
+ a_string = talloc_strdup(talloc_tos(), str);
if (a_string == NULL) {
- DEBUG(0, ("alloc_sub_advanced: Out of memory!\n"));
+ DEBUG(0, ("talloc_sub_advanced_only: Out of memory!\n"));
return NULL;
}
- for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
+ for (s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
b = a_string;
switch (*(p+1)) {
- case 'N' :
- a_string = realloc_string_sub(a_string, "%N", automount_server(user));
+ case 'N':
+ a_string = realloc_string_sub(a_string,
+ "%N",
+ lp_netbios_name());
break;
case 'H': {
char *h;
TALLOC_FREE(h);
break;
}
- case 'P':
- a_string = realloc_string_sub(a_string, "%P", connectpath);
+ case 'P':
+ a_string = realloc_string_sub(a_string, "%P", connectpath);
break;
- case 'S':
+ case 'S':
a_string = realloc_string_sub(a_string, "%S", servicename);
break;
- case 'g':
- a_string = realloc_string_sub(a_string, "%g", gidtoname(gid));
+ case 'g':
+ a_string = realloc_string_sub(a_string, "%g", gidtoname(gid));
break;
- case 'u':
- a_string = realloc_string_sub(a_string, "%u", user);
+ case 'u':
+ a_string = realloc_string_sub(a_string, "%u", user);
break;
-
- /* Patch from jkf@soton.ac.uk Left the %N (NIS
- * server name) in standard_sub_basic as it is
- * a feature for logon servers, hence uses the
- * username. The %p (NIS server path) code is
- * here as it is used instead of the default
- * "path =" string in [homes] and so needs the
- * service name, not the username. */
- case 'p':
- a_string = realloc_string_sub(a_string, "%p",
- automount_path(servicename));
- break;
-
- default:
+ default:
break;
}
}
}
- ret_string = alloc_sub_basic(smb_name, domain_name, a_string);
- SAFE_FREE(a_string);
- return ret_string;
+ return a_string;
}
-/*
- * This obviously is inefficient and needs to be merged into
- * alloc_sub_advanced...
- */
-
-char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
- const char *servicename, const char *user,
- const char *connectpath, gid_t gid,
- const char *smb_name, const char *domain_name,
- const char *str)
+char *talloc_sub_full(TALLOC_CTX *ctx,
+ const char *servicename,
+ const char *user,
+ const char *connectpath,
+ gid_t gid,
+ const char *smb_name,
+ const char *domain_name,
+ const char *str)
{
- char *a, *t;
+ char *a_string, *ret_string;
- if (!(a = alloc_sub_advanced(servicename, user, connectpath, gid,
- smb_name, domain_name, str))) {
+ a_string = talloc_sub_advanced(ctx, servicename, user, connectpath,
+ gid, str);
+ if (a_string == NULL) {
return NULL;
}
- t = talloc_strdup(mem_ctx, a);
- SAFE_FREE(a);
- return t;
-}
-
-
-void standard_sub_advanced(const char *servicename, const char *user,
- const char *connectpath, gid_t gid,
- const char *smb_name, const char *domain_name,
- char *str, size_t len)
-{
- char *s;
-
- s = alloc_sub_advanced(servicename, user, connectpath,
- gid, smb_name, domain_name, str);
-
- if ( s ) {
- strncpy( str, s, len );
- SAFE_FREE( s );
- }
-}
-/****************************************************************************
- Do some standard substitutions in a string.
-****************************************************************************/
-
-char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *str)
-{
- return talloc_sub_advanced(ctx,
- lp_servicename(SNUM(conn)),
- conn->server_info->unix_name,
- conn->connectpath,
- conn->server_info->utok.gid,
- get_smb_user_name(),
- "",
- str);
+ ret_string = talloc_sub_basic(ctx, smb_name, domain_name, a_string);
+ TALLOC_FREE(a_string);
+ return ret_string;
}
git.samba.org / samba.git / blobdiff