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

[freeradius.git] / src / modules / rlm_unix / rlm_unix.c

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 1e5cf4d..ec707c3 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -27,13 +27,10 @@
 #include       <freeradius-devel/ident.h>
 RCSID("$Id$")
 
-#include       <freeradius-devel/autoconf.h>
+#include       <freeradius-devel/radiusd.h>
 
-#include       <stdlib.h>
-#include       <string.h>
 #include       <grp.h>
 #include       <pwd.h>
-#include       <sys/types.h>
 #include       <sys/stat.h>
 
 #include "config.h"
@@ -52,7 +49,6 @@ RCSID("$Id$")
 #  include     <siad.h>
 #endif
 
-#include       <freeradius-devel/radiusd.h>
 #include       <freeradius-devel/modules.h>
 #include       <freeradius-devel/sysutmp.h>
 
@@ -127,8 +123,6 @@ static int groupcmp(void *instance, UNUSED REQUEST *req, VALUE_PAIR *request,
 static int unix_detach(void *instance)
 {
 #define inst ((struct unix_instance *)instance)
-       if (inst->radwtmp)
-               free(inst->radwtmp);
 
        paircompare_unregister(PW_GROUP, groupcmp);
 #ifdef PW_GROUP_NAME
@@ -480,7 +474,7 @@ static int unix_accounting(void *instance, REQUEST *request)
                                if (vp->length >= sizeof(ut.ut_name)) {
                                        memcpy(ut.ut_name, (char *)vp->vp_strvalue, sizeof(ut.ut_name));
                                } else {
-                                       strNcpy(ut.ut_name, (char *)vp->vp_strvalue, sizeof(ut.ut_name));
+                                       strlcpy(ut.ut_name, (char *)vp->vp_strvalue, sizeof(ut.ut_name));
                                }
                                break;
                        case PW_LOGIN_IP_HOST:
@@ -539,7 +533,7 @@ static int unix_accounting(void *instance, REQUEST *request)
         *      and address so that the tty field is unique.
         */
        sprintf(buf, "%03d:%s", nas_port, s);
-       strNcpy(ut.ut_line, buf, sizeof(ut.ut_line));
+       strlcpy(ut.ut_line, buf, sizeof(ut.ut_line));
 
        /*
         *      We store the dynamic IP address in the hostname field.
@@ -547,7 +541,7 @@ static int unix_accounting(void *instance, REQUEST *request)
 #ifdef UT_HOSTSIZE
        if (framed_address) {
                ip_ntoa(buf, framed_address);
-               strncpy(ut.ut_host, buf, sizeof(ut.ut_host));
+               strlcpy(ut.ut_host, buf, sizeof(ut.ut_host));
        }
 #endif
 #ifdef HAVE_UTMPX_H