From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1C5DE1399E6 for ; Fri, 4 Sep 2015 08:35:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60CA695879; Fri, 4 Sep 2015 08:33:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B39B895874 for ; Fri, 4 Sep 2015 08:33:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DC69340A9D for ; Fri, 4 Sep 2015 08:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E7AA1AD for ; Fri, 4 Sep 2015 08:33:28 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:skey-1.1.5-patches-2 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: skey-1.1.5-patches-2 Date: Fri, 4 Sep 2015 08:33:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 12f18be1-e6eb-4204-ac79-6545f7470a16 X-Archives-Hash: 747719eb2321d2b4f0b2e71744cf9a13 commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F1B891399E6 for ; Fri, 4 Sep 2015 08:37:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 785139588E; Fri, 4 Sep 2015 08:33:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2F919588B for ; Fri, 4 Sep 2015 08:33:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62292340A22 for ; Fri, 4 Sep 2015 08:33:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0DC41A0 for ; Fri, 4 Sep 2015 08:33:22 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: openmotif-2.2.3-patches-5 Date: Fri, 4 Sep 2015 08:33:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9d2100ad-fbd0-4d2d-adbe-0378c308b76a X-Archives-Hash: fd67a46e9aff4b475a585f328d69e4be Message-ID: <20150904083322.uTCQpVhcsX6Yc6hSOsfdPtk0PntYG1EAuTu1QTzyP6w@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8A4971399E6 for ; Fri, 4 Sep 2015 08:33:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D687E9585C; Fri, 4 Sep 2015 08:33:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FBF4143A6 for ; Fri, 4 Sep 2015 08:33:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BD97340A13 for ; Fri, 4 Sep 2015 08:33:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1343419D for ; Fri, 4 Sep 2015 08:33:22 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-4 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: openmotif-2.2.3-patches-4 Date: Fri, 4 Sep 2015 08:33:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0df9ba34-1f2f-4d61-b5e1-0e39bc17bd53 X-Archives-Hash: 779111d269bfb1638e7eb6bafb868203 Message-ID: <20150904083322.FPJUvVOJlBuks0hs44dsyxteL6XOOdWWlpBo4KUAfTk@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4FF711399E6 for ; Fri, 4 Sep 2015 08:36:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECCC595891; Fri, 4 Sep 2015 08:33:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D32D695882 for ; Fri, 4 Sep 2015 08:33:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E396340A59 for ; Fri, 4 Sep 2015 08:33:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 228AE198 for ; Fri, 4 Sep 2015 08:33:29 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:skey-1.1.5-patches-3 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: skey-1.1.5-patches-3 Date: Fri, 4 Sep 2015 08:33:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d035f7f9-de98-4a85-abbd-59615fb0f9e4 X-Archives-Hash: f1a4823b408011cdb8d9d9327f757bd3 Message-ID: <20150904083329._x8xV2giWLBNm5CqxHFX_B-28QMqH9JTKjO0Yv259Y8@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E37751399E6 for ; Fri, 4 Sep 2015 08:34:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C15E95854; Fri, 4 Sep 2015 08:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD66695850 for ; Fri, 4 Sep 2015 08:33:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1ADD8340A49 for ; Fri, 4 Sep 2015 08:33:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CC1E191 for ; Fri, 4 Sep 2015 08:33:24 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-3 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: pam_skey-1.1.5-patches-3 Date: Fri, 4 Sep 2015 08:33:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: af1753c9-b8fa-47e1-8c5d-762b1d2a5ddc X-Archives-Hash: 92ec2a689ae0caffb280c044e8e5b8c5 Message-ID: <20150904083324.beIy2d_khdlmPTHdM2E5IBC7e21XTWbCZCBZ4oSfcTM@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 241DF1399E6 for ; Fri, 4 Sep 2015 08:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CD851423A; Fri, 4 Sep 2015 08:33:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24B9D1423A for ; Fri, 4 Sep 2015 08:33:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB4493409C8 for ; Fri, 4 Sep 2015 08:33:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E639189 for ; Fri, 4 Sep 2015 08:33:20 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:motif-2.3.4-patches-1 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: motif-2.3.4-patches-1 Date: Fri, 4 Sep 2015 08:33:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7dcfc7a-6520-448f-9889-d1d1b9f50c2e X-Archives-Hash: 8338c0ff31d2d841c6bc03fd51048200 Message-ID: <20150904083320.m37q6cfDqsTovbcT0gMdK-dCv4cJ2baOqRT6aBknULk@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6F2D81399E6 for ; Fri, 4 Sep 2015 08:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83D9895863; Fri, 4 Sep 2015 08:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A57C39584F for ; Fri, 4 Sep 2015 08:33:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16F58340955 for ; Fri, 4 Sep 2015 08:33:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9618718B for ; Fri, 4 Sep 2015 08:33:23 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-2 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: pam_skey-1.1.5-patches-2 Date: Fri, 4 Sep 2015 08:33:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad6bba30-9908-44ff-9f0a-83fe45f3a334 X-Archives-Hash: 3ae3f642bf27438758c43f0fb518ede3 Message-ID: <20150904083323.aog72jX2X7PYs7OsUJZC4dpaa26kHvKdqxNd8A_e_LQ@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 36A301399E6 for ; Fri, 4 Sep 2015 08:34:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CC9C143B2; Fri, 4 Sep 2015 08:33:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B039143B2 for ; Fri, 4 Sep 2015 08:33:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD57F340A78 for ; Fri, 4 Sep 2015 08:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70382194 for ; Fri, 4 Sep 2015 08:33:25 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-5 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: pam_skey-1.1.5-patches-5 Date: Fri, 4 Sep 2015 08:33:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 59315945-7bfc-4ec3-acd5-40906fecbcca X-Archives-Hash: bf1c8502aabf14233999ffe9c4367725 Message-ID: <20150904083325.IhigwEw1VsdJZWu_oGM-lohozL95_x5FWfMSYSqGsTQ@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D56191399E6 for ; Fri, 4 Sep 2015 08:34:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 612019587B; Fri, 4 Sep 2015 08:33:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D19795856 for ; Fri, 4 Sep 2015 08:33:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3152734099A for ; Fri, 4 Sep 2015 08:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8979B1B0 for ; Fri, 4 Sep 2015 08:33:24 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-4 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: pam_skey-1.1.5-patches-4 Date: Fri, 4 Sep 2015 08:33:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 252f3493-c539-4cc3-b394-90494ca33df2 X-Archives-Hash: 4a5f9a347cae6ac966d7e1585318e4aa Message-ID: <20150904083324.gkyDClR1JkD_jfeen26X2PYO16cZR47EW08mOcB-LMI@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F37CC139A84 for ; Fri, 4 Sep 2015 08:29:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 639E7E07DF; Fri, 4 Sep 2015 08:29:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21A5114289 for ; Fri, 4 Sep 2015 08:29:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4DC4340955 for ; Fri, 4 Sep 2015 08:29:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 886B0189 for ; Fri, 4 Sep 2015 08:29:49 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:master commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: master Date: Fri, 4 Sep 2015 08:29:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a539a54-6a91-42e4-af99-4a3e0fcebc95 X-Archives-Hash: 500b88727a40907b68abcea1b087badf Message-ID: <20150904082949.mRomfhodhmKxKeTcYFMixHTUinwLxVa-TZTGSUc2wNg@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 683EA1399E6 for ; Fri, 4 Sep 2015 08:37:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE445143C4; Fri, 4 Sep 2015 08:33:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCF959585F for ; Fri, 4 Sep 2015 08:33:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A545340A6A for ; Fri, 4 Sep 2015 08:33:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 817571A0 for ; Fri, 4 Sep 2015 08:33:26 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-6 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: pam_skey-1.1.5-patches-6 Date: Fri, 4 Sep 2015 08:33:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 58392741-a321-4dae-b5a2-b66748c1b147 X-Archives-Hash: 87643c7a4d2478b598498d153d97e628 Message-ID: <20150904083326.Yk4ZzeZ26Q4JHBZSglLsVoBNki_czRGZGGMwHaehTL4@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 76EEB139A84 for ; Fri, 4 Sep 2015 08:35:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9CB19586C; Fri, 4 Sep 2015 08:33:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 012F895869 for ; Fri, 4 Sep 2015 08:33:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB9AE340A13 for ; Fri, 4 Sep 2015 08:33:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADBC018B for ; Fri, 4 Sep 2015 08:33:27 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1283970698.8c73745ca7b76a04976116de9320f75e88654058.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:skey-1.1.5-patches-1 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8c73745ca7b76a04976116de9320f75e88654058 X-VCS-Branch: skey-1.1.5-patches-1 Date: Fri, 4 Sep 2015 08:33:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d8152401-c70d-44dd-88d6-a8b74f21cad8 X-Archives-Hash: 422759f1dd4bd444249dd2b9c9bfe49b Message-ID: <20150904083327.zgx-_lyO5wHcmrL2PGQuosEOD_Hr9kwTG7m_fmI2JYs@z> commit: 8c73745ca7b76a04976116de9320f75e88654058 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 8 18:31:38 2010 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 8 18:31:38 2010 +0000 URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=8c73745c Patchset corresponding to pam_skey-1.1.5-gentoo-1.patch.bz2. patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch index 117fb94..d9562c8 100644 --- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch +++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch @@ -231,8 +231,9 @@ --- pam_skey-1.1.5/pam_skey.c +++ pam_skey/pam_skey.c @@ -1,5 +1,6 @@ - /* +-/* - * (c) 2001 Dinko Korunic, kreator@srce.hr ++/* + * Rewrite (c) 2005 Dani Church, dani.church@gmail.com + * Original (c) 2001 Dinko Korunic, kreator@srce.hr * @@ -264,7 +265,7 @@ +#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;} +#define QUERY_USERNAME NULL /* Use default username prompt */ +#define QUERY_PASSWORD "Password: " -+#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: " ++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or password: " +#define QUERY_RESPONSE "S/Key response: " PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags, @@ -600,14 +601,15 @@ } /* Get module optional parameters */ -@@ -328,13 +207,13 @@ +@@ -328,13 +207,15 @@ } /* This will talk to user through PAM_CONV */ -static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt, - char *msg_text, char **response) +static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt, -+ const char *info_text, const char *prompt_text, int echo_on, char **response) ++ const char *info_text, const char *prompt_text, int echo_on, ++ char **response) { - struct pam_message message; - const struct pam_message *pmessage = &message; @@ -615,10 +617,11 @@ struct pam_conv *conv = NULL; struct pam_response *presponse = NULL; + int i=0; ++ int status; /* Better safe than sorry */ *response = NULL; -@@ -342,26 +221,30 @@ +@@ -342,40 +223,45 @@ /* Be paranoid */ memset(&message, 0, sizeof(message)); @@ -632,7 +635,9 @@ - message.msg = msg_text; + pmessage[0] = &message[0]; + pmessage[1] = &message[1]; -+ + +- /* Do conversation and see if all is OK */ +- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) + /* Set info text, if any */ + if (info_text) { + message[i].msg = info_text; @@ -644,9 +649,8 @@ + message[i].msg = prompt_text; + message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; + i++; - - /* Do conversation and see if all is OK */ -- if (pam_get_item(pamh, PAM_CONV, (_PAM_CONST void **)&conv) ++ ++ /* Get conversation function */ + if (pam_get_item(pamh, PAM_CONV, (const void **)(void *)&conv) != PAM_SUCCESS) { @@ -658,12 +662,20 @@ - - /* Convert into pam_response - only 1 reply expected */ - if (conv->conv(1, _PAM_MSG_CAST &pmessage, &presponse, -+ /* Convert into pam_response */ -+ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse, - conv->appdata_ptr) - != PAM_SUCCESS) +- conv->appdata_ptr) +- != PAM_SUCCESS) ++ /* Do conversation and see if all is OK */ ++ status = conv->conv(i, (const struct pam_message **)pmessage, ++ &presponse, conv->appdata_ptr); ++ if (status != PAM_SUCCESS) { -@@ -372,10 +255,10 @@ +- _pam_delete(presponse->resp); +- return PAM_SERVICE_ERR; ++ if (presponse != NULL) ++ _pam_delete(presponse->resp); ++ return status; + } + if (presponse != NULL) { /* Save address */