/*
- * $Id: status.c,v 1.31 2010-03-29 15:22:57 franklahm Exp $
- *
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#ifdef AFS
const char *machine = "afs";
#else /* !AFS */
- const char *machine = "Netatalk";
+ const char *machine = "Netatalk %s";
#endif /* AFS */
+ char buf[64];
memcpy(&status, start + AFPSTATUS_MACHOFF, sizeof(status));
data += ntohs( status );
- len = strlen( machine );
+
+ // len = strlen( machine );
+ len = snprintf(buf, 64, machine, VERSION);
*data++ = len;
- memcpy( data, machine, len );
+ memcpy( data, buf, len );
data += len;
+
status = htons(data - start);
memcpy(start + AFPSTATUS_VERSOFF, &status, sizeof(status));
}
/* If cannot open conf file, use one-time signature. */
/* If -signature user:xxxxx, use it. */
-void set_signature(char *opt, struct afp_options *options) {
+void set_signature(struct afp_options *options) {
char *usersign;
int fd, i;
struct stat tmpstat;
char *servername_conf;
int header = 0;
char buf[1024], *p;
- FILE *fp, *randomp;
+ FILE *fp = NULL, *randomp;
size_t len;
+ char *server_tmp;
- if (strcmp(opt, "auto") == 0) {
+ server_tmp = (options->server ? options->server : options->hostname);
+ if (strcmp(options->signatureopt, "auto") == 0) {
goto server_signature_auto; /* default */
- } else if (strcmp(opt, "host") == 0) {
- LOG(log_warning, logtype_afpd, "WARNING: option \"-signature host\" is obsoleted. Switching back to auto.", opt);
+ } else if (strcmp(options->signatureopt, "host") == 0) {
+ LOG(log_warning, logtype_afpd, "WARNING: option \"-signature host\" is obsoleted. Switching back to auto.", options->signatureopt);
goto server_signature_auto; /* same as auto */
- } else if (strncmp(opt, "user", 4) == 0) {
+ } else if (strncmp(options->signatureopt, "user", 4) == 0) {
goto server_signature_user; /* user string */
} else {
- LOG(log_error, logtype_afpd, "ERROR: option \"-signature %s\" is not valid. Switching back to auto.", opt);
+ LOG(log_error, logtype_afpd, "ERROR: option \"-signature %s\" is not valid. Switching back to auto.", options->signatureopt);
goto server_signature_auto; /* switch back to auto*/
}
server_signature_user:
/* Signature type is user string */
- len = strlen(opt);
+ len = strlen(options->signatureopt);
if (len <= 5) {
- LOG(log_warning, logtype_afpd, "WARNING: option \"-signature %s\" is not valid. Switching back to auto.", opt);
+ LOG(log_warning, logtype_afpd, "WARNING: option \"-signature %s\" is not valid. Switching back to auto.", options->signatureopt);
goto server_signature_auto;
}
- usersign = opt + 5;
+ usersign = options->signatureopt + 5;
len = len - 5;
if (len > 16) {
LOG(log_warning, logtype_afpd, "WARNING: signature user string %s is very long !", usersign);
if ((servername_conf = strtok( p, " \t" )) == NULL)
continue; /* syntax error: invalid servername */
}
- p = index(p, '\0');
+ p = strchr(p, '\0');
p++;
if (*p == '\0')
continue; /* syntax error: missing signature */
- if (strcmp(options->server, servername_conf))
+ if (strcmp(server_tmp, servername_conf))
continue; /* another servername */
while (p && isblank(*p))
options->sigconffile, strerror(errno));
goto server_signature_random;
}
- } else { /* conf file don't exist */
+ } else { /* conf file don't exist */
if (( fd = creat(options->sigconffile, 0644 )) < 0 ) {
- LOG(log_error, logtype_atalkd, "ERROR: Cannot create %s (%s). Using one-time signature.",
+ LOG(log_error, logtype_atalkd, "Cannot create %s (%s). Using one-time signature.",
options->sigconffile, strerror(errno));
goto server_signature_random;
}
if (( fp = fdopen( fd, "w" )) == NULL ) {
- LOG(log_error, logtype_atalkd, "ERROR: Cannot fdopen %s (%s). Using one-time signature.",
+ LOG(log_error, logtype_atalkd, "Cannot fdopen %s (%s). Using one-time signature.",
options->sigconffile, strerror(errno));
close(fd);
goto server_signature_random;
server_signature_random:
/* generate signature from random number */
- if ((randomp = fopen("/dev/urandom", "r")) != NULL) { /* generate from /dev/urandom */
- for (i=0 ; i<16 ; i++) {
- (options->signature)[i] = fgetc(randomp);
- }
- LOG(log_note, logtype_afpd,
- "generate %s's signature %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X from /dev/urandom",
- options->server,
- (options->signature)[ 0], (options->signature)[ 1],
- (options->signature)[ 2], (options->signature)[ 3],
- (options->signature)[ 4], (options->signature)[ 5],
- (options->signature)[ 6], (options->signature)[ 7],
- (options->signature)[ 8], (options->signature)[ 9],
- (options->signature)[10], (options->signature)[11],
- (options->signature)[12], (options->signature)[13],
- (options->signature)[14], (options->signature)[15]);
-
- } else { /* genarate from random() because cannot open /dev/urandom */
- srandom((unsigned int)time(NULL) + (unsigned int)options + (unsigned int)options->server);
- for (i=0 ; i<16 ; i++) {
- (options->signature)[i] = random() & 0xFF;
- }
- LOG(log_note, logtype_afpd,
- "generate %s's signature %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X from random()",
- options->server,
- (options->signature)[ 0], (options->signature)[ 1],
- (options->signature)[ 2], (options->signature)[ 3],
- (options->signature)[ 4], (options->signature)[ 5],
- (options->signature)[ 6], (options->signature)[ 7],
- (options->signature)[ 8], (options->signature)[ 9],
- (options->signature)[10], (options->signature)[11],
- (options->signature)[12], (options->signature)[13],
- (options->signature)[14], (options->signature)[15]);
- }
+ randombytes(options->signature, 16);
- if (fp && header) { /* conf file is created or size=0 */
+ if (fp && header) { /* conf file is created or size=0 */
fprintf(fp, "# DON'T TOUCH NOR COPY THOUGHTLESSLY!\n");
fprintf(fp, "# This file is auto-generated by afpd.\n");
fprintf(fp, "# \n");
}
if (fp) {
- fprintf(fp, "\"%s\"\t", options->server);
+ fprintf(fp, "\"%s\"\t", server_tmp);
for (i=0 ; i<16 ; i++) {
fprintf(fp, "%02X", (options->signature)[i]);
}
/* retrun */
LOG(log_info, logtype_afpd,
" \"%s\"'s signature is %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
- options->server,
+ server_tmp,
(options->signature)[ 0], (options->signature)[ 1],
(options->signature)[ 2], (options->signature)[ 3],
(options->signature)[ 4], (options->signature)[ 5],
projects / netatalk.git / blobdiff