From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jan Friesse <jfriesse@redhat.com>
Date: Mon, 29 Aug 2011 09:46:03 +0200
Subject: [Cluster-devel] [PATCH] config: allow cman to configure uid/gid
 for	corosync IPC
In-Reply-To: <1314598644-4625-1-git-send-email-fdinitto@redhat.com>
References: <1314598644-4625-1-git-send-email-fdinitto@redhat.com>
Message-ID: <4E5B43BB.8030101@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Reviewed-by: Jan Friesse <jfriesse@redhat.com>

Fabio M. Di Nitto wrote:
> Resolves: rhbz#733345
> 
> Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
> ---
>  cman/daemon/cman-preconfig.c         |    1 +
>  config/tools/xml/cluster.rng.in.head |   22 ++++++++++++++++++++++
>  2 files changed, 23 insertions(+), 0 deletions(-)
> 
> diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
> index 4b8419e..64f505f 100644
> --- a/cman/daemon/cman-preconfig.c
> +++ b/cman/daemon/cman-preconfig.c
> @@ -1532,6 +1532,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
>  		ret = copy_tree_to_root(objdb, "amf", 0);
>  		ret = copy_tree_to_root(objdb, "aisexec", 0);
>  		ret = copy_tree_to_root(objdb, "service", 1);
> +		ret = copy_tree_to_root(objdb, "uidgid", 0);
>  	}
>  
>  	objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
> diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
> index 7696533..1afa9e8 100644
> --- a/config/tools/xml/cluster.rng.in.head
> +++ b/config/tools/xml/cluster.rng.in.head
> @@ -7,6 +7,7 @@ xmlns:rha="http://redhat.com/~pkennedy/annotation_namespace/cluster_conf_annot_n
>  cluster
>  - cman
>  - totem
> +- uidgid
>  - quorumd
>  - fence_daemon
>  - fence_xvmd
> @@ -169,6 +170,27 @@ To validate your cluster.conf against this schema, run:
>   </optional>
>  <!-- end cman block -->
>  
> +<!-- uidgid block -->
> + <optional>
> +  <zeroOrMore>
> +   <element name="uidgid" rha:description="Access control to corosync IPC">
> +    <optional>
> +     <attribute name="uid" rha:description="This is an unprivileged username,
> +         as globally available to the system via /etc/passwd, including nis/ldap,
> +         allowed to connect to corosync IPC. This value cannot be updated at runtime,
> +         a full cman restart is required." rha:default="" rha:samble="userfoo"/>
> +    </optional>
> +    <optional>
> +     <attribute name="gid" rha:description="This is an unprivileged group name,
> +         as globally available to the system via /etc/group, including nis/ldap,
> +         allowed to connect to corosync IPC. This value cannot be updated at runtime,
> +         a full cman restart is required." rha:default="" rha:samble="groupfoo"/>
> +    </optional>
> +   </element>
> +  </zeroOrMore>
> + </optional>
> +<!-- end uidgid block -->
> +
>  <!-- totem block -->
>   <optional>
>    <element name="totem" rha:description="OpenAIS msg transport