View | Details | Raw Unified | Return to bug 936 | Differences between
and this patch

Collapse All | Expand All

(-)auth2-chall.c~ (+9 lines)
Lines 32-37 Link Here
32
#include "xmalloc.h"
32
#include "xmalloc.h"
33
#include "dispatch.h"
33
#include "dispatch.h"
34
#include "log.h"
34
#include "log.h"
35
#include "servconf.h"
36
37
/* import */
38
extern ServerOptions options;
35
39
36
static int auth2_challenge_start(Authctxt *);
40
static int auth2_challenge_start(Authctxt *);
37
static int send_userauth_info_request(Authctxt *);
41
static int send_userauth_info_request(Authctxt *);
Lines 82-87 Link Here
82
	if (strcmp(devs, "") == 0) {
86
	if (strcmp(devs, "") == 0) {
83
		buffer_init(&b);
87
		buffer_init(&b);
84
		for (i = 0; devices[i]; i++) {
88
		for (i = 0; devices[i]; i++) {
89
#ifdef USE_PAM
90
			if (!options.use_pam &&
91
			    strcmp(devices[i]->name, "pam") == 0)
92
				continue;
93
#endif
85
			if (buffer_len(&b) > 0)
94
			if (buffer_len(&b) > 0)
86
				buffer_append(&b, ",", 1);
95
				buffer_append(&b, ",", 1);
87
			buffer_append(&b, devices[i]->name,
96
			buffer_append(&b, devices[i]->name,

Return to bug 936