ignore).
- don't do extra do_lstat() if we only have one matching file.
djm@ ok
+ - dtucker@cvs.openbsd.org 2004/12/11 01:48:56
+ [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h]
+ Fix debug call in error path of authorized_keys processing and fix related
+ warnings; ok djm@
20041208
- (tim) [configure.ac] Comment some non obvious platforms in the
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-rsa.c,v 1.61 2004/12/06 11:41:03 dtucker Exp $");
+RCSID("$OpenBSD: auth-rsa.c,v 1.62 2004/12/11 01:48:56 dtucker Exp $");
#include <openssl/rsa.h>
#include <openssl/md5.h>
#include "hostfile.h"
#include "monitor_wrap.h"
#include "ssh.h"
+#include "misc.h"
/* import */
extern ServerOptions options;
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2-pubkey.c,v 1.8 2004/12/06 11:41:03 dtucker Exp $");
+RCSID("$OpenBSD: auth2-pubkey.c,v 1.9 2004/12/11 01:48:56 dtucker Exp $");
#include "ssh.h"
#include "ssh2.h"
#include "auth-options.h"
#include "canohost.h"
#include "monitor_wrap.h"
+#include "misc.h"
/* import */
extern ServerOptions options;
*/
#include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
#include "log.h"
#include "authfile.h"
#include "rsa.h"
+#include "misc.h"
/* Version identification string for SSH v1 identity files. */
static const char authfile_id_string[] =
FILE *f;
char line[SSH_MAX_PUBKEY_BYTES];
char *cp;
- int linenum = 0;
+ u_long linenum = 0;
f = fopen(filename, "r");
if (f != NULL) {
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.26 2004/12/06 11:41:03 dtucker Exp $");
+RCSID("$OpenBSD: misc.c,v 1.27 2004/12/11 01:48:56 dtucker Exp $");
#include "misc.h"
#include "log.h"
*/
int
read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
- int *lineno)
+ u_long *lineno)
{
while (fgets(buf, bufsz, f) != NULL) {
(*lineno)++;
if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
return 0;
} else {
- debug("%s: %s line %d exceeds size limit", __func__,
- filename, lineno);
+ debug("%s: %s line %lu exceeds size limit", __func__,
+ filename, *lineno);
/* discard remainder of line */
while(fgetc(f) != '\n' && !feof(f))
; /* nothing */
-/* $OpenBSD: misc.h,v 1.19 2004/12/06 11:41:03 dtucker Exp $ */
+/* $OpenBSD: misc.h,v 1.20 2004/12/11 01:48:56 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
char *read_passphrase(const char *, int);
int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
-int read_keyfile_line(FILE *, const char *, char *, size_t, int *);
+int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);