From 29a37854bfb5d1d2b8b69e657018d0f7976d9530 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 10 May 2005 00:32:43 +0000 Subject: [PATCH] Fix acl_unparse - add missing style specifiers --- servers/slapd/aclparse.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c index c9ec267727..56ac41e109 100644 --- a/servers/slapd/aclparse.c +++ b/servers/slapd/aclparse.c @@ -2406,30 +2406,52 @@ access2text( Access *b, char *ptr ) } if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) { - ptr = lutil_strcopy( ptr, " peername=\"" ); + ptr = lutil_strcopy( ptr, " peername" ); + *ptr++ = '.'; + ptr = lutil_strcopy( ptr, style_strings[b->a_peername_style] ); + *ptr++ = '='; + *ptr++ = '"'; ptr = lutil_strcopy( ptr, b->a_peername_pat.bv_val ); *ptr++ = '"'; } if ( !BER_BVISEMPTY( &b->a_sockname_pat ) ) { - ptr = lutil_strcopy( ptr, " sockname=\"" ); + ptr = lutil_strcopy( ptr, " sockname" ); + *ptr++ = '.'; + ptr = lutil_strcopy( ptr, style_strings[b->a_sockname_style] ); + *ptr++ = '='; + *ptr++ = '"'; ptr = lutil_strcopy( ptr, b->a_sockname_pat.bv_val ); *ptr++ = '"'; } if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) { - ptr = lutil_strcopy( ptr, " domain=" ); + ptr = lutil_strcopy( ptr, " domain" ); + *ptr++ = '.'; + ptr = lutil_strcopy( ptr, style_strings[b->a_domain_style] ); + if ( b->a_domain_expand ) { + ptr = lutil_strcopy( ptr, ",expand" ); + } + *ptr++ = '='; ptr = lutil_strcopy( ptr, b->a_domain_pat.bv_val ); } if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) { - ptr = lutil_strcopy( ptr, " sockurl=\"" ); + ptr = lutil_strcopy( ptr, " sockurl" ); + *ptr++ = '.'; + ptr = lutil_strcopy( ptr, style_strings[b->a_sockurl_style] ); + *ptr++ = '='; + *ptr++ = '"'; ptr = lutil_strcopy( ptr, b->a_sockurl_pat.bv_val ); *ptr++ = '"'; } if ( !BER_BVISEMPTY( &b->a_set_pat ) ) { - ptr = lutil_strcopy( ptr, " set=\"" ); + ptr = lutil_strcopy( ptr, " set" ); + *ptr++ = '.'; + ptr = lutil_strcopy( ptr, style_strings[b->a_set_style] ); + *ptr++ = '='; + *ptr++ = '"'; ptr = lutil_strcopy( ptr, b->a_set_pat.bv_val ); *ptr++ = '"'; } -- 2.39.5