Attachment 144863 Details for Bug 221533 – 3 of 3 upstream patches

[patch] 3 of 3 upstream patches

nfs-utils-1.0.8-007-gssd_check_gssapi_early.dif (text/plain), 3.08 KB, created by Steve Dickson on 2007-01-04 22:43:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2007-01-04 22:43:33 UTC

Size: 3.08 KB

patch

obsolete

>
>Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
>
>Do a call to determine mechanisms supported by the gssapi library early.
>This allows us to discover early in case the gssapi library is somehow
>misconfigured.  We can bail out early and give a meaningful message
>rather than getting errors on each attempt at a context negotiation.
>
>
>---
>
> nfs-utils-1.0.8-kwc/utils/gssd/gss_util.c |   25 +++++++++++++++++++++++++
> nfs-utils-1.0.8-kwc/utils/gssd/gss_util.h |    1 +
> nfs-utils-1.0.8-kwc/utils/gssd/gssd.c     |    3 +++
> nfs-utils-1.0.8-kwc/utils/gssd/svcgssd.c  |    5 +++++
> 4 files changed, 34 insertions(+)
>
>diff -puN utils/gssd/gssd.c~gssd_check_gssapi_early utils/gssd/gssd.c
>--- nfs-utils-1.0.8/utils/gssd/gssd.c~gssd_check_gssapi_early	2006-06-16 16:01:06.369495000 -0400
>+++ nfs-utils-1.0.8-kwc/utils/gssd/gssd.c	2006-06-16 16:01:06.483495000 -0400
>@@ -145,6 +145,9 @@ main(int argc, char *argv[])
> 			    "support setting debug level\n");
> #endif
> 
>+	if (gssd_check_mechs() != 0)
>+		errx(1, "Problem with gssapi library");
>+
> 	if (!fg && daemon(0, 0) < 0)
> 		errx(1, "fork");
> 
>diff -puN utils/gssd/gss_util.c~gssd_check_gssapi_early utils/gssd/gss_util.c
>--- nfs-utils-1.0.8/utils/gssd/gss_util.c~gssd_check_gssapi_early	2006-06-16 16:01:06.401495000 -0400
>+++ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.c	2006-06-16 16:01:06.519495000 -0400
>@@ -224,3 +224,28 @@ gssd_acquire_cred(char *server_name)
> 
> 	return (maj_stat == GSS_S_COMPLETE);
> }
>+
>+int gssd_check_mechs(void)
>+{
>+	u_int32_t maj_stat, min_stat;
>+	gss_OID_set supported_mechs = GSS_C_NO_OID_SET;
>+	int retval = -1;
>+
>+	maj_stat = gss_indicate_mechs(&min_stat, &supported_mechs);
>+	if (maj_stat != GSS_S_COMPLETE) {
>+		printerr(0, "Unable to obtain list of supported mechanisms. "
>+			 "Check that gss library is properly configured.\n");
>+		goto out;
>+	}
>+	if (supported_mechs == GSS_C_NO_OID_SET ||
>+	    supported_mechs->count == 0) {
>+		printerr(0, "Unable to obtain list of supported mechanisms. "
>+			 "Check that gss library is properly configured.\n");
>+		goto out;
>+	}
>+	maj_stat = gss_release_oid_set(&min_stat, &supported_mechs);
>+	retval = 0;
>+out:
>+	return retval;
>+}
>+
>diff -puN utils/gssd/gss_util.h~gssd_check_gssapi_early utils/gssd/gss_util.h
>--- nfs-utils-1.0.8/utils/gssd/gss_util.h~gssd_check_gssapi_early	2006-06-16 16:01:06.426496000 -0400
>+++ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.h	2006-06-16 16:01:06.542495000 -0400
>@@ -40,5 +40,6 @@ extern gss_cred_id_t	gssd_creds;
> int gssd_acquire_cred(char *server_name);
> void pgsserr(char *msg, u_int32_t maj_stat, u_int32_t min_stat,
> 	const gss_OID mech);
>+int gssd_check_mechs(void);
> 
> #endif /* _GSS_UTIL_H_ */
>diff -puN utils/gssd/svcgssd.c~gssd_check_gssapi_early utils/gssd/svcgssd.c
>--- nfs-utils-1.0.8/utils/gssd/svcgssd.c~gssd_check_gssapi_early	2006-06-16 16:01:06.454495000 -0400
>+++ nfs-utils-1.0.8-kwc/utils/gssd/svcgssd.c	2006-06-16 16:01:06.576495000 -0400
>@@ -204,6 +204,11 @@ main(int argc, char *argv[])
> 			    "support setting debug level\n");
> #endif
> 
>+	if (gssd_check_mechs() != 0) {
>+		printerr(0, "ERROR: Problem with gssapi library\n");
>+		exit(1);
>+	}
>+
> 	if (!fg)
> 		mydaemon(0, 0);
> 
>
>_

Actions: View | Diff

Attachments on bug 221533: 144861 | 144862 | 144863