#include <netinet/in.h>
#include <arpa/inet.h>
-#include <netatalk/endian.h>
-#include <atalk/asp.h>
#include <atalk/dsi.h>
#include <atalk/afp.h>
#include <atalk/util.h>
+#include <atalk/globals.h>
-#include "globals.h"
#include "afp_config.h"
#include "auth.h"
#include "uam_auth.h"
if ((p = strchr(pwent->pw_gecos, ',')))
*p = '\0';
- if ((size_t)-1 == ( gecoslen = convert_string(obj->options.unixcharset, CH_UCS2,
- pwent->pw_gecos, -1, user, sizeof(username))) )
- continue;
- if ((size_t)-1 == ( pwnamelen = convert_string(obj->options.unixcharset, CH_UCS2,
- pwent->pw_name, -1, pwname, sizeof(username))) )
+ gecoslen = convert_string(obj->options.unixcharset, CH_UCS2,
+ pwent->pw_gecos, -1, user, sizeof(username));
+ pwnamelen = convert_string(obj->options.unixcharset, CH_UCS2,
+ pwent->pw_name, -1, pwname, sizeof(username));
+ if ((size_t)-1 == gecoslen && (size_t)-1 == pwnamelen)
continue;
int uam_random_string (AFPObj *obj, char *buf, int len)
{
- u_int32_t result;
+ uint32_t result;
int ret;
int fd;
if (!obj)
return AFPERR_PARAM;
-#ifndef NO_DDP
- switch (obj->proto) {
- case AFPPROTO_ASP:
- if ((len = asp_wrtcont(obj->handle, buf, buflen )) < 0)
- goto uam_afp_read_err;
- return action(handle, buf, *buflen);
- break;
-
- case AFPPROTO_DSI:
-#endif
len = dsi_writeinit(obj->handle, buf, *buflen);
if (!len || ((len = action(handle, buf, len)) < 0)) {
dsi_writeflush(obj->handle);
goto uam_afp_read_err;
}
}
-#ifndef NO_DDP
- break;
- }
-#endif
return 0;
uam_afp_read_err: