diff options
| author | Jeremy Allison <jra@samba.org> | 2000-12-07 19:26:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-12-07 19:26:04 +0000 |
| commit | cf5b71994d6cdb2f81c390579f4a0e676926c6b9 (patch) | |
| tree | ee7f1164bf48be2c95651e21bb88b41ec84859f6 /source3/smbd | |
| parent | 0d658c35eb9d8ec400ad0302ee11d489bb59bd77 (diff) | |
| download | samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.gz samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.bz2 samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.zip | |
file_lines_load/file_lines_pload can now optionally convert unix_to_dos()
on read.
Jeremy.
(This used to be commit 76b8dd376d13eb4469417be217c966d54d333367)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/dfree.c | 2 | ||||
| -rw-r--r-- | source3/smbd/groupname.c | 2 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 6 | ||||
| -rw-r--r-- | source3/smbd/password.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c index ee5722acd5..c8c4437155 100644 --- a/source3/smbd/dfree.c +++ b/source3/smbd/dfree.c @@ -91,7 +91,7 @@ static SMB_BIG_UINT disk_free(char *path, BOOL small_query, slprintf(syscmd, sizeof(syscmd), "%s %s", dfree_command, path); DEBUG (3, ("disk_free: Running command %s\n", syscmd)); - lines = file_lines_pload(syscmd, NULL); + lines = file_lines_pload(syscmd, NULL, True); if (lines) { char *line = lines[0]; if (strlen(line) > 0) diff --git a/source3/smbd/groupname.c b/source3/smbd/groupname.c index d53fa56a44..d44e9a7a39 100644 --- a/source3/smbd/groupname.c +++ b/source3/smbd/groupname.c @@ -101,7 +101,7 @@ void load_groupname_map(void) * Load the file. */ - lines = file_lines_load(groupname_map_file,NULL); + lines = file_lines_load(groupname_map_file,NULL,False); if (!lines) { DEBUG(0,("load_groupname_map: can't open groupname map %s. Error was %s\n", groupname_map_file, strerror(errno))); diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 1e461f10a9..c9193db4a8 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -544,7 +544,7 @@ static void fill_printq_info_52(connection_struct *conn, int snum, int uLevel, DEBUG(10,("snum: %d\nlp_printerdriver: [%s]\nlp_driverfile: [%s]\n", snum, lp_printerdriver(snum), lp_driverfile(snum))); - lines = file_lines_load(lp_driverfile(snum),NULL); + lines = file_lines_load(lp_driverfile(snum),NULL, False); if (!lines) { DEBUG(3,("Can't open %s - %s\n", lp_driverfile(snum), @@ -785,7 +785,7 @@ static int get_printerdrivernumber(int snum) DEBUG(10,("snum: %d\nlp_printerdriver: [%s]\nlp_driverfile: [%s]\n", snum, lp_printerdriver(snum), lp_driverfile(snum))); - lines = file_lines_load(lp_driverfile(snum), NULL); + lines = file_lines_load(lp_driverfile(snum), NULL, False); if (!lines) { DEBUG(3,("Can't open %s - %s\n", lp_driverfile(snum),strerror(errno))); @@ -1089,7 +1089,7 @@ static int get_server_info(uint32 servertype, BOOL local_list_only; int i; - lines = file_lines_load(lock_path(SERVER_LIST), NULL); + lines = file_lines_load(lock_path(SERVER_LIST), NULL, False); if (!lines) { DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno))); return(0); diff --git a/source3/smbd/password.c b/source3/smbd/password.c index f759f3b781..f9657eb9ee 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -854,7 +854,7 @@ static BOOL check_user_equiv(char *user, char *remote, char *equiv_file) int plus_allowed = 1; char *file_host; char *file_user; - char **lines = file_lines_load(equiv_file, NULL); + char **lines = file_lines_load(equiv_file, NULL, False); int i; DEBUG(5, ("check_user_equiv %s %s %s\n", user, remote, equiv_file)); |