X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fauth.c;h=60a5b69c8c5c76cb8c0c785ed8f278f934f639f7;hp=9d8fbf78aeb7b0fbb2c13b9336dcc8ef126687f9;hb=2fdd522410f80afcd055d7333f491ee6c0b4b9fa;hpb=3e5cb6c7f7ee853300e3486c20890813c6182d3f diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c index 9d8fbf78..60a5b69c 100644 --- a/etc/afpd/auth.c +++ b/etc/afpd/auth.c @@ -10,13 +10,12 @@ #include #include #include -#ifdef HAVE_UNISTD_H #include -#endif /* HAVE_UNISTD_H */ #include #include #include -#include +#include + #include #include #include @@ -78,19 +77,16 @@ static struct uam_obj uam_changepw = {"", "", 0, {{NULL, NULL, NULL, NULL}}, &ua static struct uam_obj *afp_uam = NULL; -void status_versions( char *data, const ASP asp, const DSI *dsi) +void status_versions( char *data, const DSI *dsi) { char *start = data; - u_int16_t status; + uint16_t status; int len, num, i, count = 0; memcpy(&status, start + AFPSTATUS_VERSOFF, sizeof(status)); num = sizeof( afp_versions ) / sizeof( afp_versions[ 0 ] ); for ( i = 0; i < num; i++ ) { -#ifndef NO_DDP - if ( !asp && (afp_versions[ i ].av_number <= 21)) continue; -#endif /* ! NO_DDP */ if ( !dsi && (afp_versions[ i ].av_number >= 22)) continue; count++; } @@ -98,9 +94,6 @@ void status_versions( char *data, const ASP asp, const DSI *dsi) *data++ = count; for ( i = 0; i < num; i++ ) { -#ifndef NO_DDP - if ( !asp && (afp_versions[ i ].av_number <= 21)) continue; -#endif /* ! NO_DDP */ if ( !dsi && (afp_versions[ i ].av_number >= 22)) continue; len = strlen( afp_versions[ i ].av_name ); *data++ = len; @@ -114,7 +107,7 @@ void status_versions( char *data, const ASP asp, const DSI *dsi) void status_uams(char *data, const char *authlist) { char *start = data; - u_int16_t status; + uint16_t status; struct uam_obj *uams; int len, num = 0; @@ -265,45 +258,6 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void), int expi LOG(log_note, logtype_afpd, "%s Login by %s", afp_versions[afp_version_index].av_name, pwd->pw_name); -#ifndef NO_DDP - if (obj->proto == AFPPROTO_ASP) { - ASP asp = obj->handle; - int addr_net = ntohs( asp->asp_sat.sat_addr.s_net ); - int addr_node = asp->asp_sat.sat_addr.s_node; - - if (obj->options.authprintdir) { - if(addr_net && addr_node) { /* Do we have a valid Appletalk address? */ - char nodename[256]; - FILE *fp; - int mypid = getpid(); - struct stat stat_buf; - - sprintf(nodename, "%s/net%d.%dnode%d", obj->options.authprintdir, - addr_net / 256, addr_net % 256, addr_node); - LOG(log_info, logtype_afpd, "registering %s (uid %d) on %u.%u as %s", - pwd->pw_name, pwd->pw_uid, addr_net, addr_node, nodename); - - if (stat(nodename, &stat_buf) == 0) { /* file exists */ - if (S_ISREG(stat_buf.st_mode)) { /* normal file */ - unlink(nodename); - fp = fopen(nodename, "w"); - fprintf(fp, "%s:%d\n", pwd->pw_name, mypid); - fclose(fp); - chown( nodename, pwd->pw_uid, -1 ); - } else { /* somebody is messing with us */ - LOG(log_error, logtype_afpd, "print authfile %s is not a normal file, it will not be modified", nodename ); - } - } else { /* file 'nodename' does not exist */ - fp = fopen(nodename, "w"); - fprintf(fp, "%s:%d\n", pwd->pw_name, mypid); - fclose(fp); - chown( nodename, pwd->pw_uid, -1 ); - } - } /* if (addr_net && addr_node ) */ - } /* if (options->authprintdir) */ - } /* if (obj->proto == AFPPROTO_ASP) */ -#endif - if (initgroups( pwd->pw_name, pwd->pw_gid ) < 0) { #ifdef RUN_AS_USER LOG(log_info, logtype_afpd, "running with uid %d", geteuid()); @@ -403,11 +357,6 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void), int expi obj->uid = geteuid(); obj->logout = logout; -#ifdef FORCE_UIDGID - obj->force_uid = 1; - save_uidgid ( &obj->uidgid ); -#endif - return( AFP_OK ); } @@ -507,10 +456,10 @@ int afp_getsession( char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen) { - u_int16_t type; - u_int32_t idlen = 0; - u_int32_t boottime; - u_int32_t tklen, tp; + uint16_t type; + uint32_t idlen = 0; + uint32_t boottime; + uint32_t tklen, tp; char *token; char *p; @@ -609,8 +558,8 @@ int afp_getsession( int afp_disconnect(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { DSI *dsi = (DSI *)obj->handle; - u_int16_t type; - u_int32_t tklen; + uint16_t type; + uint32_t tklen; pid_t token; int i; @@ -776,7 +725,7 @@ int afp_login_ext(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *r size_t len; int i; char type; - u_int16_t len16; + uint16_t len16; char *username; *rbuflen = 0; @@ -1008,9 +957,9 @@ int afp_changepw(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rb /* FPGetUserInfo */ int afp_getuserinfo(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { - u_int8_t thisuser; - u_int32_t id; - u_int16_t bitmap; + uint8_t thisuser; + uint32_t id; + uint16_t bitmap; char *bitmapp; LOG(log_debug, logtype_afpd, "begin afp_getuserinfo:");