aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libtinyrad/lconf.c13
-rw-r--r--lib/libtinyrad/lfile.c2
2 files changed, 5 insertions, 10 deletions
diff --git a/lib/libtinyrad/lconf.c b/lib/libtinyrad/lconf.c
index 74cad09..70ce722 100644
--- a/lib/libtinyrad/lconf.c
+++ b/lib/libtinyrad/lconf.c
@@ -121,7 +121,6 @@ tinyrad_conf(
121 TinyRadDict * dict, 121 TinyRadDict * dict,
122 unsigned opts ) 122 unsigned opts )
123{ 123{
124 int rc;
125 const char * suffix; 124 const char * suffix;
126 const char * filename; 125 const char * filename;
127 const char * prefix; 126 const char * prefix;
@@ -150,8 +149,7 @@ tinyrad_conf(
150 { 149 {
151 tinyrad_strlcat(path, "/", sizeof(path)); 150 tinyrad_strlcat(path, "/", sizeof(path));
152 tinyrad_strlcat(path, suffix, sizeof(path)); 151 tinyrad_strlcat(path, suffix, sizeof(path));
153 if ((rc = tinyrad_conf_file(tr, dict, path)) != TRAD_SUCCESS) 152 tinyrad_conf_file(tr, dict, path);
154 return(TRAD_SUCCESS);
155 }; 153 };
156 154
157 // lookup user 155 // lookup user
@@ -162,21 +160,18 @@ tinyrad_conf(
162 tinyrad_strlcpy(path, prefix, sizeof(path)); 160 tinyrad_strlcpy(path, prefix, sizeof(path));
163 tinyrad_strlcat(path, "/.", sizeof(path)); 161 tinyrad_strlcat(path, "/.", sizeof(path));
164 tinyrad_strlcat(path, suffix, sizeof(path)); 162 tinyrad_strlcat(path, suffix, sizeof(path));
165 if ((rc = tinyrad_conf_file(tr, dict, path)) != TRAD_SUCCESS) 163 tinyrad_conf_file(tr, dict, path);
166 return(TRAD_SUCCESS);
167 164
168 // search for RC file in home directory 165 // search for RC file in home directory
169 tinyrad_strlcpy(path, prefix, sizeof(path)); 166 tinyrad_strlcpy(path, prefix, sizeof(path));
170 tinyrad_strlcat(path, "/", sizeof(path)); 167 tinyrad_strlcat(path, "/", sizeof(path));
171 tinyrad_strlcat(path, suffix, sizeof(path)); 168 tinyrad_strlcat(path, suffix, sizeof(path));
172 if ((rc = tinyrad_conf_file(tr, dict, path)) != TRAD_SUCCESS) 169 tinyrad_conf_file(tr, dict, path);
173 return(TRAD_SUCCESS);
174 170
175 // load global configuration 171 // load global configuration
176 if ((filename = getenv("TINYRADCONF")) == NULL) 172 if ((filename = getenv("TINYRADCONF")) == NULL)
177 filename = SYSCONFDIR "/tinyrad.conf"; 173 filename = SYSCONFDIR "/tinyrad.conf";
178 if ((rc = tinyrad_conf_file(tr, dict, filename)) != TRAD_SUCCESS) 174 tinyrad_conf_file(tr, dict, filename);
179 return(TRAD_SUCCESS);
180 175
181 return(TRAD_SUCCESS); 176 return(TRAD_SUCCESS);
182} 177}
diff --git a/lib/libtinyrad/lfile.c b/lib/libtinyrad/lfile.c
index 17e6485..400fa81 100644
--- a/lib/libtinyrad/lfile.c
+++ b/lib/libtinyrad/lfile.c
@@ -248,7 +248,7 @@ tinyrad_readline(
248 // check file descriptor 248 // check file descriptor
249 if (fd == -1) 249 if (fd == -1)
250 return(TRAD_EINVAL); 250 return(TRAD_EINVAL);
251 if ((rc = fstat(fd, &sb)) == -1) 251 if (fstat(fd, &sb) == -1)
252 return(TRAD_EINVAL); 252 return(TRAD_EINVAL);
253 253
254 if ((bytes_read)) 254 if ((bytes_read))