projects
/
freeradius.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Signed / unsigned fixes and function prototypes
[freeradius.git]
/
src
/
main
/
radwho.c
diff --git
a/src/main/radwho.c
b/src/main/radwho.c
index
3b8549d
..
fec34c9
100644
(file)
--- a/
src/main/radwho.c
+++ b/
src/main/radwho.c
@@
-49,13
+49,13
@@
RCSID("$Id$")
* Header above output and format.
*/
static const char *hdr1 =
* Header above output and format.
*/
static const char *hdr1 =
-"Login Name What TTY When From Location";
-static const char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3u %-9.9s %-
9.9
s %-.19s%s";
+"Login Name What TTY When From
Location";
+static const char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3u %-9.9s %-
15.15
s %-.19s%s";
static const char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%s%s";
static const char *hdr2 =
static const char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%s%s";
static const char *hdr2 =
-"Login Port What When From Location";
-static const char *rfmt2 = "%-10.10s %s%-5u %-6.6s %-13.13s %-1
0.10
s %-.28s%s";
+"Login Port What When From
Location";
+static const char *rfmt2 = "%-10.10s %s%-5u %-6.6s %-13.13s %-1
5.15
s %-.28s%s";
static const char *rfmt2r = "%s,%s%u,%s,%s,%s,%s%s";
static const char *eol = "\n";
static const char *rfmt2r = "%s,%s%u,%s,%s,%s,%s%s";
static const char *eol = "\n";
@@
-67,7
+67,7
@@
const char *progname = "radwho";
const char *radlog_dir = NULL;
const char *radutmp_file = NULL;
const char *radlog_dir = NULL;
const char *radutmp_file = NULL;
-c
onst c
har *radius_dir = NULL;
+char *radius_dir = NULL;
const char *radacct_dir = NULL;
const char *radlib_dir = NULL;
uint32_t myip = INADDR_ANY;
const char *radacct_dir = NULL;
const char *radlib_dir = NULL;
uint32_t myip = INADDR_ANY;
@@
-77,6
+77,14
@@
int log_stripped_names;
* Global, for log.c to use.
*/
struct main_config_t mainconfig;
* Global, for log.c to use.
*/
struct main_config_t mainconfig;
+char *request_log_file = NULL;
+char *debug_log_file = NULL;
+int radius_xlat(char *out, UNUSED int outlen, UNUSED const char *fmt,
+ UNUSED REQUEST *request, UNUSED RADIUS_ESCAPE_STRING func)
+{
+ *out = 0;
+ return 0;
+}
struct radutmp_config_t {
char *radutmp_fn;
struct radutmp_config_t {
char *radutmp_fn;
@@
-112,7
+120,7
@@
static FILE *safe_popen(const char *cmd, const char *mode)
/*
* Print a file from FINGER_DIR. If the file is executable,
/*
* Print a file from FINGER_DIR. If the file is executable,
- * execute it instead. Return 0 if succes
ful
l.
+ * execute it instead. Return 0 if succes
sfu
l.
*/
static int ffile(const char *arg)
{
*/
static int ffile(const char *arg)
{
@@
-222,10
+230,10
@@
static char *dotime(time_t t)
char *s = ctime(&t);
if (showname) {
char *s = ctime(&t);
if (showname) {
- strlcpy(s + 4, s + 11,
5
);
+ strlcpy(s + 4, s + 11,
6
);
s[9] = 0;
} else {
s[9] = 0;
} else {
- strlcpy(s + 4, s + 8,
8
);
+ strlcpy(s + 4, s + 8,
9
);
s[12] = 0;
}
s[12] = 0;
}
@@
-522,11
+530,11
@@
int main(int argc, char **argv)
memcpy(nasname, rt.login, sizeof(rt.login));
nasname[sizeof(rt.login)] = '\0';
memcpy(nasname, rt.login, sizeof(rt.login));
nasname[sizeof(rt.login)] = '\0';
-
librad_safeprint(nasname, -1
, buffer,
+
fr_print_string(nasname, 0
, buffer,
sizeof(buffer));
printf("User-Name = \"%s\"\n", buffer);
sizeof(buffer));
printf("User-Name = \"%s\"\n", buffer);
-
librad_safeprint(session_id, -1
, buffer,
+
fr_print_string(session_id, 0
, buffer,
sizeof(buffer));
printf("Acct-Session-Id = \"%s\"\n", buffer);
sizeof(buffer));
printf("Acct-Session-Id = \"%s\"\n", buffer);
@@
-570,7
+578,7
@@
int main(int argc, char **argv)
sizeof(rt.caller_id));
nasname[sizeof(rt.caller_id)] = '\0';
sizeof(rt.caller_id));
nasname[sizeof(rt.caller_id)] = '\0';
-
librad_safeprint(nasname, -1
, buffer,
+
fr_print_string(nasname, 0
, buffer,
sizeof(buffer));
printf("Calling-Station-Id = \"%s\"\n", buffer);
}
sizeof(buffer));
printf("Calling-Station-Id = \"%s\"\n", buffer);
}