Massively cleaned up #include's, so they're in a consistent

[freeradius.git] / src / main / xlat.c

diff --git a/src/main/xlat.c b/src/main/xlat.c
index b299f30..4794c6c 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -25,17 +25,11 @@
 #include <freeradius-devel/ident.h>
 RCSID("$Id$")
 
-#include       <freeradius-devel/autoconf.h>
-
-#include       <stdio.h>
-#include       <stdlib.h>
-#include       <string.h>
-#include       <ctype.h>
-
 #include       <freeradius-devel/radiusd.h>
-
 #include       <freeradius-devel/rad_assert.h>
 
+#include       <ctype.h>
+
 typedef struct xlat_t {
        char            module[MAX_STRING_LEN];
        int             length;
@@ -966,12 +960,12 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'A': /* radacct_dir */
-                               strlcpy(q,radacct_dir,freespace-1);
+                               strlcpy(q,radacct_dir,freespace);
                                q += strlen(q);
                                p++;
                                break;
                        case 'C': /* ClientName */
-                               strlcpy(q,client_name_old(&request->packet->src_ipaddr),freespace-1);
+                               strlcpy(q,client_name_old(&request->packet->src_ipaddr),freespace);
                                q += strlen(q);
                                p++;
                                break;
@@ -994,7 +988,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'L': /* radlog_dir */
-                               strlcpy(q,radlog_dir,freespace-1);
+                               strlcpy(q,radlog_dir,freespace);
                                q += strlen(q);
                                p++;
                                break;
@@ -1003,7 +997,7 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                p++;
                                break;
                        case 'R': /* radius_dir */
-                               strlcpy(q,radius_dir,freespace-1);
+                               strlcpy(q,radius_dir,freespace);
                                q += strlen(q);
                                p++;
                                break;
@@ -1031,9 +1025,9 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                break;
                        case 'V': /* Request-Authenticator */
                                if (request->packet->verified)
-                                       strlcpy(q,"Verified",freespace-1);
+                                       strlcpy(q,"Verified",freespace);
                                else
-                                       strlcpy(q,"None",freespace-1);
+                                       strlcpy(q,"None",freespace);
                                q += strlen(q);
                                p++;
                                break;