Deleted Added
full compact
auth-bsdauth.c (92555) auth-bsdauth.c (98675)
1/*
2 * Copyright (c) 2001 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 8 unchanged lines hidden (view full) ---

17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24#include "includes.h"
1/*
2 * Copyright (c) 2001 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 8 unchanged lines hidden (view full) ---

17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24#include "includes.h"
25RCSID("$OpenBSD: auth-bsdauth.c,v 1.2 2001/12/19 07:18:56 deraadt Exp $");
25RCSID("$OpenBSD: auth-bsdauth.c,v 1.4 2002/06/19 00:27:55 deraadt Exp $");
26
27#ifdef BSD_AUTH
28#include "xmalloc.h"
29#include "auth.h"
30#include "log.h"
26
27#ifdef BSD_AUTH
28#include "xmalloc.h"
29#include "auth.h"
30#include "log.h"
31#include "monitor_wrap.h"
31
32static void *
33bsdauth_init_ctx(Authctxt *authctxt)
34{
35 return authctxt;
36}
37
32
33static void *
34bsdauth_init_ctx(Authctxt *authctxt)
35{
36 return authctxt;
37}
38
38static int
39int
39bsdauth_query(void *ctx, char **name, char **infotxt,
40 u_int *numprompts, char ***prompts, u_int **echo_on)
41{
42 Authctxt *authctxt = ctx;
43 char *challenge = NULL;
44
45 if (authctxt->as != NULL) {
46 debug2("bsdauth_query: try reuse session");

--- 4 unchanged lines hidden (view full) ---

51 }
52 }
53
54 if (challenge == NULL) {
55 debug2("bsdauth_query: new bsd auth session");
56 debug3("bsdauth_query: style %s",
57 authctxt->style ? authctxt->style : "<default>");
58 authctxt->as = auth_userchallenge(authctxt->user,
40bsdauth_query(void *ctx, char **name, char **infotxt,
41 u_int *numprompts, char ***prompts, u_int **echo_on)
42{
43 Authctxt *authctxt = ctx;
44 char *challenge = NULL;
45
46 if (authctxt->as != NULL) {
47 debug2("bsdauth_query: try reuse session");

--- 4 unchanged lines hidden (view full) ---

52 }
53 }
54
55 if (challenge == NULL) {
56 debug2("bsdauth_query: new bsd auth session");
57 debug3("bsdauth_query: style %s",
58 authctxt->style ? authctxt->style : "<default>");
59 authctxt->as = auth_userchallenge(authctxt->user,
59 authctxt->style, "auth-ssh", &challenge);
60 authctxt->style, "auth-ssh", &challenge);
60 if (authctxt->as == NULL)
61 challenge = NULL;
62 debug2("bsdauth_query: <%s>", challenge ? challenge : "empty");
63 }
64
65 if (challenge == NULL)
66 return -1;
67
61 if (authctxt->as == NULL)
62 challenge = NULL;
63 debug2("bsdauth_query: <%s>", challenge ? challenge : "empty");
64 }
65
66 if (challenge == NULL)
67 return -1;
68
68 *name = xstrdup("");
69 *infotxt = xstrdup("");
69 *name = xstrdup("");
70 *infotxt = xstrdup("");
70 *numprompts = 1;
71 *prompts = xmalloc(*numprompts * sizeof(char*));
72 *echo_on = xmalloc(*numprompts * sizeof(u_int));
73 (*echo_on)[0] = 0;
74 (*prompts)[0] = xstrdup(challenge);
75
76 return 0;
77}
78
71 *numprompts = 1;
72 *prompts = xmalloc(*numprompts * sizeof(char*));
73 *echo_on = xmalloc(*numprompts * sizeof(u_int));
74 (*echo_on)[0] = 0;
75 (*prompts)[0] = xstrdup(challenge);
76
77 return 0;
78}
79
79static int
80int
80bsdauth_respond(void *ctx, u_int numresponses, char **responses)
81{
82 Authctxt *authctxt = ctx;
83 int authok;
84
85 if (authctxt->as == 0)
86 error("bsdauth_respond: no bsd auth session");
87

--- 20 unchanged lines hidden (view full) ---

108
109KbdintDevice bsdauth_device = {
110 "bsdauth",
111 bsdauth_init_ctx,
112 bsdauth_query,
113 bsdauth_respond,
114 bsdauth_free_ctx
115};
81bsdauth_respond(void *ctx, u_int numresponses, char **responses)
82{
83 Authctxt *authctxt = ctx;
84 int authok;
85
86 if (authctxt->as == 0)
87 error("bsdauth_respond: no bsd auth session");
88

--- 20 unchanged lines hidden (view full) ---

109
110KbdintDevice bsdauth_device = {
111 "bsdauth",
112 bsdauth_init_ctx,
113 bsdauth_query,
114 bsdauth_respond,
115 bsdauth_free_ctx
116};
117
118KbdintDevice mm_bsdauth_device = {
119 "bsdauth",
120 bsdauth_init_ctx,
121 mm_bsdauth_query,
122 mm_bsdauth_respond,
123 bsdauth_free_ctx
124};
116#endif
125#endif