+commit ee3099dbc71c6190cc612e923506c7d634b4b3c9
+Author: Ville Skyttä <ville.skytta@iki.fi>
+Date: Tue Jun 19 10:10:40 2012 -0400
+
+ idmapd.conf.5: Fixed some syntax typos
+
+ Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/idmapd.conf.5 b/idmapd.conf.5
+index 9c7f1ae..7b9e762 100644
+--- a/idmapd.conf.5
++++ b/idmapd.conf.5
+@@ -234,7 +234,6 @@ Number of seconds before timing out an LDAP request
+ .\" -------------------------------------------------------------------
+ .\"
+ .SH EXAMPLES
+-."
+ An example
+ .I /etc/idmapd.conf
+ file:
+@@ -266,7 +265,7 @@ johndoe@OTHER.DOMAIN.ORG = johnny
+ LDAP_server = ldap.domain.org
+ LDAP_base = dc=org,dc=domain
+
+-.fo
++.fi
+ .\"
+ .\" -------------------------------------------------------------------
+ .\" Additional sections
+@@ -275,11 +274,11 @@ LDAP_base = dc=org,dc=domain
+ .SH SEE ALSO
+ .BR idmapd (8)
+ .BR svcgssd (8)
+-.".SH COMPATIBILITY
+-.".SH STANDARDS
+-.".SH ACKNOWLEDGEMENTS
+-.".SH AUTHORS
+-.".SH HISTORY
++.\".SH COMPATIBILITY
++.\".SH STANDARDS
++.\".SH ACKNOWLEDGEMENTS
++.\".SH AUTHORS
++.\".SH HISTORY
+ .SH BUGS
+ Report bugs to <nfsv4@linux-nfs.org>
+-.".SH CAVEATS
++.\".SH CAVEATS
+
+commit f079113f90366f1965b9fd3b0fdbce77415f37a7
+Author: Juno Krahn <Juno.Krahn@gmail.com>
+Date: Mon Mar 19 08:33:58 2012 -0400
+
+ idmapd: logging of Local-Realms only lists the last realm
+
+ The list of local realms can be logged with a massage like the following:
+ rpc.idmapd: libnfsidmap: Realms list: 'EXAMPLE2.COM'
+ Instead of printing a list of realms, only the last realm in the list is shown.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=804152
+
+ Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/libnfsidmap.c b/libnfsidmap.c
+index 57bb6c3..641d766 100644
+--- a/libnfsidmap.c
++++ b/libnfsidmap.c
+@@ -285,8 +285,9 @@ int nfs4_init_name_mapping(char *conffile)
+ }
+ buf = malloc(siz);
+ if (buf) {
++ *buf = 0;
+ TAILQ_FOREACH(r, &local_realms->fields, link) {
+- sprintf(buf, "'%s' ", r->field);
++ sprintf(buf+strlen(buf), "'%s' ", r->field);
+ }
+ IDMAP_LOG(1, ("libnfsidmap: Realms list: %s", buf));
+ free(buf);