diff options
| author | Volker Lendecke <vl@samba.org> | 2009-02-13 10:56:34 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-02-13 12:15:03 +0100 |
| commit | 0844cca1d5e4579b54af7d03509f3f97fac43bdc (patch) | |
| tree | 48e92ab9ebeb54a485394849e3bcc2b0aca7734a /source4 | |
| parent | e7f7ed8bf6281ef01aca53ea44acdd4af4c51aa7 (diff) | |
| download | samba-0844cca1d5e4579b54af7d03509f3f97fac43bdc.tar.gz samba-0844cca1d5e4579b54af7d03509f3f97fac43bdc.tar.bz2 samba-0844cca1d5e4579b54af7d03509f3f97fac43bdc.zip | |
Replace get_myname() with the talloc version from v3-3-test
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/client/smbspool.c | 4 | ||||
| -rw-r--r-- | source4/param/loadparm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c index df867d5fef..cfba5992d3 100644 --- a/source4/client/smbspool.c +++ b/source4/client/smbspool.c @@ -268,12 +268,12 @@ smb_connect(const char *workgroup, /* I - Workgroup */ * Get the names and addresses of the client and server... */ - myname = get_myname(); + myname = get_myname(NULL); nt_status = smbcli_full_connection(NULL, &c, myname, server, ports, share, NULL, username, workgroup, password, NULL); - free(myname); + talloc_free(myname); if (!NT_STATUS_IS_OK(nt_status)) { fprintf(stderr, "ERROR: Connection failed with error %s\n", nt_errstr(nt_status)); return NULL; diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 0cd92c16f1..6789aa1ac2 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2286,9 +2286,9 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_do_global_parameter(lp_ctx, "socket options", "TCP_NODELAY"); #endif lp_do_global_parameter(lp_ctx, "workgroup", DEFAULT_WORKGROUP); - myname = get_myname(); + myname = get_myname(lp_ctx); lp_do_global_parameter(lp_ctx, "netbios name", myname); - SAFE_FREE(myname); + talloc_free(myname); lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast"); lp_do_global_parameter(lp_ctx, "fstype", "NTFS"); |