Attachment 65945 Details for Bug 53889 – Pass join/leave options to various kerberos membership implementations

[patch] Pass join/leave options to various kerberos membership implementations

0001-Pass-join-leave-options-to-various-kerberos-membersh.patch (text/plain), 12.48 KB, created by Stef Walter on 2012-08-22 12:05:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2012-08-22 12:05:27 UTC

Size: 12.48 KB

patch

obsolete

>From bd3715ff323a3112928407c5c7db89afbb5ac0a0 Mon Sep 17 00:00:00 2001
>From: Stef Walter <stefw@gnome.org>
>Date: Wed, 22 Aug 2012 13:43:54 +0200
>Subject: [PATCH 1/2] Pass join/leave options to various kerberos membership
> implementations
>
>https://bugs.freedesktop.org/show_bug.cgi?id=53889
>---
> service/realm-kerberos.c | 41 ++++++++++++++++++++++-------------------
> service/realm-kerberos.h |  6 ++++++
> service/realm-samba.c    |  2 ++
> service/realm-sssd-ad.c  |  2 ++
> service/realm-sssd-ipa.c |  2 ++
> 5 files changed, 34 insertions(+), 19 deletions(-)
>
>diff --git a/service/realm-kerberos.c b/service/realm-kerberos.c
>index e9f3513..0a8b22a 100644
>--- a/service/realm-kerberos.c
>+++ b/service/realm-kerberos.c
>@@ -156,6 +156,7 @@ on_unenroll_complete (GObject *source,
> static void
> enroll_or_unenroll_with_ccache (RealmKerberos *self,
>                                 RealmKerberosFlags flags,
>+                                GVariant *options,
>                                 GDBusMethodInvocation *invocation,
>                                 GVariant *ccache,
>                                 gboolean enroll)
>@@ -193,12 +194,12 @@ enroll_or_unenroll_with_ccache (RealmKerberos *self,
> 
> 	if (enroll) {
> 		g_return_if_fail (klass->enroll_finish != NULL);
>-		(klass->enroll_ccache_async) (self, bytes, flags, invocation, on_enroll_complete,
>-		                              method_closure_new (self, invocation));
>+		(klass->enroll_ccache_async) (self, bytes, flags, options, invocation,
>+		                              on_enroll_complete, method_closure_new (self, invocation));
> 	} else {
> 		g_return_if_fail (klass->unenroll_finish != NULL);
>-		(klass->unenroll_ccache_async) (self, bytes, flags, invocation, on_unenroll_complete,
>-		                                method_closure_new (self, invocation));
>+		(klass->unenroll_ccache_async) (self, bytes, flags, options, invocation,
>+		                                on_unenroll_complete, method_closure_new (self, invocation));
> 	}
> 
> 	g_bytes_unref (bytes);
>@@ -207,6 +208,7 @@ enroll_or_unenroll_with_ccache (RealmKerberos *self,
> static void
> enroll_or_unenroll_with_password (RealmKerberos *self,
>                                   RealmKerberosFlags flags,
>+                                  GVariant *options,
>                                   GDBusMethodInvocation *invocation,
>                                   const gchar *name,
>                                   const gchar *password,
>@@ -231,19 +233,20 @@ enroll_or_unenroll_with_password (RealmKerberos *self,
> 
> 	if (enroll) {
> 		g_return_if_fail (klass->enroll_finish != NULL);
>-		(klass->enroll_password_async) (self, name, password, flags, invocation, on_enroll_complete,
>-		                                method_closure_new (self, invocation));
>+		(klass->enroll_password_async) (self, name, password, flags, options, invocation,
>+		                                on_enroll_complete, method_closure_new (self, invocation));
> 
> 	} else {
> 		g_return_if_fail (klass->unenroll_finish != NULL);
>-		(klass->unenroll_password_async) (self, name, password, flags, invocation, on_unenroll_complete,
>-		                                method_closure_new (self, invocation));
>+		(klass->unenroll_password_async) (self, name, password, flags, options, invocation,
>+		                                  on_unenroll_complete, method_closure_new (self, invocation));
> 	}
> }
> 
> static void
> enroll_or_unenroll_with_automatic (RealmKerberos *self,
>                                    RealmKerberosFlags flags,
>+                                   GVariant *options,
>                                    GDBusMethodInvocation *invocation,
>                                    gboolean enroll)
> {
>@@ -266,12 +269,12 @@ enroll_or_unenroll_with_automatic (RealmKerberos *self,
> 
> 	if (enroll) {
> 		g_return_if_fail (klass->enroll_finish != NULL);
>-		(klass->enroll_automatic_async) (self, flags, invocation, on_enroll_complete,
>-		                                 method_closure_new (self, invocation));
>+		(klass->enroll_automatic_async) (self, flags, options, invocation,
>+		                                 on_enroll_complete, method_closure_new (self, invocation));
> 	} else {
> 		g_return_if_fail (klass->enroll_finish != NULL);
>-		(klass->unenroll_automatic_async) (self, flags, invocation, on_unenroll_complete,
>-		                                   method_closure_new (self, invocation));
>+		(klass->unenroll_automatic_async) (self, flags, options, invocation,
>+		                                   on_unenroll_complete, method_closure_new (self, invocation));
> 	}
> }
> 
>@@ -352,14 +355,14 @@ handle_join (RealmDbusKerberosMembership *membership,
> 
> 	switch (cred_type) {
> 	case REALM_KERBEROS_CREDENTIAL_CCACHE:
>-		enroll_or_unenroll_with_ccache (self, flags, invocation, creds, TRUE);
>+		enroll_or_unenroll_with_ccache (self, flags, options, invocation, creds, TRUE);
> 		break;
> 	case REALM_KERBEROS_CREDENTIAL_PASSWORD:
> 		g_variant_get (creds, "(&s&s)", &name, &password);
>-		enroll_or_unenroll_with_password (self, flags, invocation, name, password, TRUE);
>+		enroll_or_unenroll_with_password (self, flags, options, invocation, name, password, TRUE);
> 		break;
> 	case REALM_KERBEROS_CREDENTIAL_AUTOMATIC:
>-		enroll_or_unenroll_with_automatic (self, flags, invocation, TRUE);
>+		enroll_or_unenroll_with_automatic (self, flags, options, invocation, TRUE);
> 		break;
> 	default:
> 		g_assert_not_reached ();
>@@ -390,14 +393,14 @@ handle_leave (RealmDbusKerberosMembership *membership,
> 
> 	switch (cred_type) {
> 	case REALM_KERBEROS_CREDENTIAL_CCACHE:
>-		enroll_or_unenroll_with_ccache (self, flags, invocation, creds, FALSE);
>+		enroll_or_unenroll_with_ccache (self, flags, options, invocation, creds, FALSE);
> 		break;
> 	case REALM_KERBEROS_CREDENTIAL_PASSWORD:
> 		g_variant_get (creds, "(&s&s)", &name, &password);
>-		enroll_or_unenroll_with_password (self, flags, invocation, name, password, FALSE);
>+		enroll_or_unenroll_with_password (self, flags, options, invocation, name, password, FALSE);
> 		break;
> 	case REALM_KERBEROS_CREDENTIAL_AUTOMATIC:
>-		enroll_or_unenroll_with_automatic (self, flags, invocation, FALSE);
>+		enroll_or_unenroll_with_automatic (self, flags, options, invocation, FALSE);
> 		break;
> 	default:
> 		g_assert_not_reached ();
>@@ -419,7 +422,7 @@ handle_deconfigure (RealmDbusRealm *realm,
> 	realm_diagnostics_setup_options (invocation, options);
> 
> 	enroll_or_unenroll_with_automatic (self, REALM_KERBEROS_CREDENTIAL_COMPUTER,
>-	                                   invocation, FALSE);
>+	                                   options, invocation, FALSE);
> 	return TRUE;
> }
> 
>diff --git a/service/realm-kerberos.h b/service/realm-kerberos.h
>index 8dc2723..bb85ace 100644
>--- a/service/realm-kerberos.h
>+++ b/service/realm-kerberos.h
>@@ -68,6 +68,7 @@ struct _RealmKerberosClass {
> 	                                         const char *name,
> 	                                         const char *password,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
>@@ -75,12 +76,14 @@ struct _RealmKerberosClass {
> 	void       (* enroll_ccache_async)      (RealmKerberos *realm,
> 	                                         GBytes *ccache,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
> 
> 	void       (* enroll_automatic_async)   (RealmKerberos *realm,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
>@@ -93,6 +96,7 @@ struct _RealmKerberosClass {
> 	                                         const char *name,
> 	                                         const char *password,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
>@@ -100,12 +104,14 @@ struct _RealmKerberosClass {
> 	void       (* unenroll_ccache_async)    (RealmKerberos *realm,
> 	                                         GBytes *ccache,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
> 
> 	void       (* unenroll_automatic_async) (RealmKerberos *realm,
> 	                                         RealmKerberosFlags flags,
>+	                                         GVariant *options,
> 	                                         GDBusMethodInvocation *invocation,
> 	                                         GAsyncReadyCallback callback,
> 	                                         gpointer user_data);
>diff --git a/service/realm-samba.c b/service/realm-samba.c
>index bbca0ce..fd72874 100644
>--- a/service/realm-samba.c
>+++ b/service/realm-samba.c
>@@ -260,6 +260,7 @@ realm_samba_enroll_async (RealmKerberos *realm,
>                           const gchar *name,
>                           const gchar *password,
>                           RealmKerberosFlags flags,
>+                          GVariant *options,
>                           GDBusMethodInvocation *invocation,
>                           GAsyncReadyCallback callback,
>                           gpointer user_data)
>@@ -385,6 +386,7 @@ realm_samba_unenroll_async (RealmKerberos *realm,
>                             const gchar *name,
>                             const gchar *password,
>                             RealmKerberosFlags flags,
>+                            GVariant *options,
>                             GDBusMethodInvocation *invocation,
>                             GAsyncReadyCallback callback,
>                             gpointer user_data)
>diff --git a/service/realm-sssd-ad.c b/service/realm-sssd-ad.c
>index 9737975..b2cfc63 100644
>--- a/service/realm-sssd-ad.c
>+++ b/service/realm-sssd-ad.c
>@@ -278,6 +278,7 @@ realm_sssd_ad_enroll_async (RealmKerberos *realm,
>                             const char *name,
>                             const char *password,
>                             RealmKerberosFlags flags,
>+                            GVariant *options,
>                             GDBusMethodInvocation *invocation,
>                             GAsyncReadyCallback callback,
>                             gpointer user_data)
>@@ -431,6 +432,7 @@ realm_sssd_ad_unenroll_async (RealmKerberos *realm,
>                               const gchar *name,
>                               const gchar *password,
>                               RealmKerberosFlags flags,
>+                              GVariant *options,
>                               GDBusMethodInvocation *invocation,
>                               GAsyncReadyCallback callback,
>                               gpointer user_data)
>diff --git a/service/realm-sssd-ipa.c b/service/realm-sssd-ipa.c
>index f92253b..1340998 100644
>--- a/service/realm-sssd-ipa.c
>+++ b/service/realm-sssd-ipa.c
>@@ -79,6 +79,7 @@ static void
> realm_sssd_ipa_enroll_async (RealmKerberos *realm,
>                              GBytes *admin_kerberos_cache,
>                              RealmKerberosFlags flags,
>+                             GVariant *options,
>                              GDBusMethodInvocation *invocation,
>                              GAsyncReadyCallback callback,
>                              gpointer user_data)
>@@ -97,6 +98,7 @@ static void
> realm_sssd_ipa_unenroll_async (RealmKerberos *realm,
>                                GBytes *admin_kerberos_cache,
>                                RealmKerberosFlags flags,
>+                               GVariant *options,
>                                GDBusMethodInvocation *invocation,
>                                GAsyncReadyCallback callback,
>                                gpointer user_data)
>-- 
>1.7.11.5
>

Actions: View | Splinter Review

Attachments on bug 53889: 65945 | 65946 | 65948

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.