diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
| commit | 1b99d8fbb591bedb375c1251d5d29a5674e1b74a (patch) | |
| tree | 5e4cf4d115081057750349373184ad7df8894e61 /source3/smbd | |
| parent | 652f0e601da0d1d2e2c8b9281bbee9fa399d9877 (diff) | |
| download | samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.gz samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.bz2 samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.zip | |
Use common util_file code.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/dfree.c | 2 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 6 | ||||
| -rw-r--r-- | source3/smbd/map_username.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c index 1ddcd48d40..282027ee5a 100644 --- a/source3/smbd/dfree.c +++ b/source3/smbd/dfree.c @@ -112,7 +112,7 @@ SMB_BIG_UINT sys_disk_free(connection_struct *conn, const char *path, bool small *bsize = STR_TO_SMB_BIG_UINT(p, NULL); else *bsize = 1024; - file_lines_free(lines); + TALLOC_FREE(lines); DEBUG (3, ("Parsed output of dfree, dsize=%u, dfree=%u, bsize=%u\n", (unsigned int)*dsize, (unsigned int)*dfree, (unsigned int)*bsize)); diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index fe1d766b9d..0c866da706 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1154,7 +1154,7 @@ static int get_server_info(uint32 servertype, bool local_list_only; int i; - lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0); + lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0, NULL); if (!lines) { DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno))); return 0; @@ -1186,7 +1186,7 @@ static int get_server_info(uint32 servertype, *servers = SMB_REALLOC_ARRAY(*servers,struct srv_info_struct, alloced); if (!*servers) { DEBUG(0,("get_server_info: failed to enlarge servers info struct!\n")); - file_lines_free(lines); + TALLOC_FREE(lines); return 0; } memset((char *)((*servers)+count),'\0',sizeof(**servers)*(alloced-count)); @@ -1267,7 +1267,7 @@ static int get_server_info(uint32 servertype, } } - file_lines_free(lines); + TALLOC_FREE(lines); return count; } diff --git a/source3/smbd/map_username.c b/source3/smbd/map_username.c index 7536758bcb..a8899dd538 100644 --- a/source3/smbd/map_username.c +++ b/source3/smbd/map_username.c @@ -116,7 +116,7 @@ bool map_username(fstring user) } numlines = 0; - qlines = fd_lines_load(fd, &numlines,0); + qlines = fd_lines_load(fd, &numlines,0, NULL); DEBUGADD(10,("Lines returned = [%d]\n", numlines)); close(fd); @@ -127,7 +127,7 @@ bool map_username(fstring user) fstrcpy( user, qlines[0] ); } - file_lines_free(qlines); + TALLOC_FREE(qlines); return numlines != 0; } |