RC2 for third_party.
Volker Lendecke
Volker.Lendecke at SerNet.DE
Tue Aug 12 23:32:09 MDT 2014
On Wed, Aug 13, 2014 at 04:01:08PM +1200, Andrew Bartlett wrote:
> On Wed, 2014-08-13 at 05:55 +0200, Volker Lendecke wrote:
> > On Wed, Aug 13, 2014 at 03:18:17PM +1200, Andrew Bartlett wrote:
> > > On Mon, 2014-08-11 at 09:21 -0700, Jeremy Allison wrote:
> > > > On Sun, Aug 10, 2014 at 08:51:37AM +0200, Andreas Schneider wrote:
> > > > > Feel free to rebase it. The code is from libssh, but it works a bit different
> > > > > there.
> > > > >
> > > > > http://git.libssh.org/projects/libssh.git/tree/src/config.c
> > > >
> > > > Ah, it's LGPLv2.1+. I was hoping for MIT/BSD...
> > >
> > > Jeremy,
> > >
> > > What is the issue with bringing LGPLv2.1+ code into Samba?
> >
> > pam_winbind is more liberal, and that's where we need it.
>
> Just after pressing send I realised that was probably what the thought
> was, but then I checked: pam_winbind also links against libwbclient,
> which is LGPLv3.
Just to throw another NIH one into the mix: Attached find tini.[ch]. I'm
not sure it covers *all* subtleties of params.c, but I tested some of
the obvious ones and it seems to behave the same. No dependencies, fresh
code with the pam_winbind.c license. pam_winbind should be adaptable to
it I guess.
What do people think?
Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From c7f9fe96c273e75ca57c28da0521c41284a10e61 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 12 Aug 2014 13:02:35 +0200
Subject: [PATCH 1/2] tini
---
lib/util/tini.c | 298 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/util/tini.h | 44 +++++++
lib/util/wscript_build | 7 +-
3 files changed, 348 insertions(+), 1 deletion(-)
create mode 100644 lib/util/tini.c
create mode 100644 lib/util/tini.h
diff --git a/lib/util/tini.c b/lib/util/tini.c
new file mode 100644
index 0000000..8e955a1
--- /dev/null
+++ b/lib/util/tini.c
@@ -0,0 +1,298 @@
+/*
+ * Trivial smb.conf parsing code
+ *
+ * Copyright Volker Lendecke <vl at samba.org> 2014
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, and the entire permission notice in its entirety,
+ * including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions. (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include "tini.h"
+
+static int next_content(FILE *f)
+{
+ int c;
+
+ for (c = fgetc(f); c != EOF; c = fgetc(f)) {
+ if (!isspace(c)) {
+ break;
+ }
+ if (c == '\n') {
+ break;
+ }
+ }
+
+ return c;
+}
+
+static int next_end_of_line(FILE *f)
+{
+ int c;
+
+ for (c = fgetc(f); c != EOF; c = fgetc(f)) {
+ if (c == '\n') {
+ break;
+ }
+ }
+ return c;
+}
+
+static bool make_space(char **buf, size_t *buflen, size_t position)
+{
+ char *tmp;
+
+ if (position < *buflen) {
+ return true;
+ }
+ tmp = realloc(*buf, (*buflen) * 2);
+ if (tmp == NULL) {
+ return false;
+ }
+ *buf = tmp;
+ *buflen *= 2;
+ return true;
+}
+
+/*
+ * Get a conf line into *pbuf (which must be a malloc'ed buffer already).
+ *
+ * Ignores leading spaces
+ * Ignores comment lines
+ * Ignores empty lines
+ * Takes care of continuation lines
+ * Zaps multiple spaces into one
+ */
+
+static int get_line(FILE *f, char **pbuf, size_t *pbuflen)
+{
+ int c;
+ char *buf;
+ size_t buflen, pos;
+
+ buf = *pbuf;
+ buflen = *pbuflen;
+ pos = 0;
+
+next_line:
+
+ c = next_content(f);
+ if (c == EOF) {
+ return ENOENT;
+ }
+
+ if ((c == '#') || (c == ';')) {
+ /*
+ * Line starting with a comment, skip
+ */
+ c = next_end_of_line(f);
+ if (c == EOF) {
+ return ENOENT;
+ }
+ goto next_line;
+ }
+
+ if (c == '\n') {
+ /*
+ * Blank line, skip
+ */
+ goto next_line;
+ }
+
+ for ( ; c != EOF ; c = fgetc(f)) {
+
+ if (c == '\n') {
+
+ if ((pos > 0) && (buf[pos-1] == '\\')) {
+ /*
+ * Line ends in "\". Continuation.
+ */
+ pos -= 1;
+ continue;
+ }
+
+ if ((pos > 1) && (buf[pos-2] == '\\') &&
+ isspace(buf[pos-1])) {
+ /*
+ * Line ends in "\ ". Mind that we zap
+ * multiple spaces into one. Continuation.
+ */
+ pos -= 2;
+ continue;
+ }
+
+ /*
+ * No continuation, done with the line
+ */
+ break;
+ }
+
+ if ((pos > 0) && isspace(buf[pos-1]) && isspace(c)) {
+ /*
+ * Zap multiple spaces to one
+ */
+ continue;
+ }
+
+ if (!make_space(&buf, &buflen, pos)) {
+ return ENOMEM;
+ }
+ buf[pos++] = c;
+ }
+
+ if (!make_space(&buf, &buflen, pos)) {
+ return ENOMEM;
+ }
+ buf[pos++] = '\0';
+
+ *pbuf = buf;
+ return 0;
+}
+
+static bool parse_section(
+ char *buf, bool (*sfunc)(const char *section, void *private_data),
+ void *private_data)
+{
+ char *p, *q;
+
+ p = buf+1; /* skip [ */
+
+ q = strchr(p, ']');
+ if (q == NULL) {
+ return false;
+ }
+ *q = '\0';
+
+ return sfunc(p, private_data);
+}
+
+static char *trim_one_space(char *buf)
+{
+ size_t len;
+
+ if (isspace(buf[0])) {
+ buf += 1;
+ }
+ len = strlen(buf);
+ if (len == 0) {
+ return buf;
+ }
+ if (isspace(buf[len-1])) {
+ buf[len-1] = '\0';
+ }
+
+ return buf;
+}
+
+static bool parse_param(char *buf,
+ bool (*pfunc)(const char *name, const char *value,
+ void *private_data),
+ void *private_data)
+{
+ char *equals;
+ char *name, *value;
+ size_t len;
+
+ equals = strchr(buf, '=');
+ if (equals == NULL) {
+ return true;
+ }
+ *equals = '\0';
+
+ name = trim_one_space(buf);
+ len = strlen(buf);
+ if (len == 0) {
+ return false;
+ }
+
+ value = trim_one_space(equals+1);
+
+ return pfunc(name, value, private_data);
+}
+
+bool tini_parse(FILE *f,
+ bool (*sfunc)(const char *section, void *private_data),
+ bool (*pfunc)(const char *name, const char *value,
+ void *private_data),
+ void *private_data)
+{
+ char *buf;
+ size_t buflen;
+
+ buflen = 256;
+
+ buf = malloc(buflen);
+ if (buf == NULL) {
+ return false;
+ }
+
+ while (true) {
+ int ret;
+ bool ok;
+
+ ret = get_line(f, &buf, &buflen);
+
+ if (ret == ENOENT) {
+ /* No lines anymore */
+ break;
+ }
+
+ if (ret != 0) {
+ /* Real error */
+ free(buf);
+ return false;
+ }
+
+ switch(buf[0]) {
+ case 0:
+ continue;
+ break;
+ case '[':
+ ok = parse_section(buf, sfunc, private_data);
+ break;
+ default:
+ ok = parse_param(buf, pfunc, private_data);
+ break;
+ }
+
+ if (!ok) {
+ free(buf);
+ return false;
+ }
+ }
+ free(buf);
+ return true;
+}
diff --git a/lib/util/tini.h b/lib/util/tini.h
new file mode 100644
index 0000000..02cc1ac
--- /dev/null
+++ b/lib/util/tini.h
@@ -0,0 +1,44 @@
+/*
+ * Trivial smb.conf parsing code
+ *
+ * Copyright Volker Lendecke <vl at samba.org> 2014
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, and the entire permission notice in its entirety,
+ * including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions. (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+
+bool tini_parse(FILE *f,
+ bool (*sfunc)(const char *section, void *private_data),
+ bool (*pfunc)(const char *name, const char *value,
+ void *private_data),
+ void *private_data);
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7c4abf9..cd8e64d 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -5,6 +5,11 @@ bld.SAMBA_SUBSYSTEM('time-basic',
deps='replace',
local_include=False)
+bld.SAMBA_SUBSYSTEM('tini',
+ source='tini.c',
+ deps='',
+ local_include=False)
+
bld.SAMBA_SUBSYSTEM('close-low-fd',
source='close_low_fd.c',
deps='replace',
@@ -24,7 +29,7 @@ bld.SAMBA_LIBRARY('samba-util',
util_str.c util_str_common.c substitute.c ms_fnmatch.c
server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
tevent_debug.c util_process.c memcache.c''',
- deps='DYNCONFIG time-basic close-low-fd samba-debug',
+ deps='DYNCONFIG time-basic close-low-fd samba-debug tini',
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon',
public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
--
1.7.9.5
From 02e2dd27b37c76417188e77aa774469e582ea56a Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 13 Aug 2014 07:24:21 +0200
Subject: [PATCH 2/2] use tini
---
lib/util/params.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/lib/util/params.c b/lib/util/params.c
index 3f1d535..82c6e89 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -80,6 +80,7 @@
#include "includes.h"
#include "system/locale.h"
+#include "tini.h"
/* -------------------------------------------------------------------------- **
* Constants...
@@ -521,6 +522,8 @@ static myFILE *OpenConfFile(TALLOC_CTX *mem_ctx, const char *FileName )
return( ret );
} /* OpenConfFile */
+#if 0
+
bool pm_process( const char *FileName,
bool (*sfunc)(const char *, void *),
bool (*pfunc)(const char *, const char *, void *),
@@ -579,4 +582,29 @@ bool pm_process( const char *FileName,
return( true ); /* Generic success. */
} /* pm_process */
+#else
+
/* -------------------------------------------------------------------------- */
+
+bool pm_process(const char *filename,
+ bool (*sfunc)(const char *section, void *private_data),
+ bool (*pfunc)(const char *name, const char *value,
+ void *private_data),
+ void *private_data)
+{
+ FILE *f;
+ bool ret;
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ return false;
+ }
+
+ ret = tini_parse(f, sfunc, pfunc, private_data);
+
+ fclose(f);
+
+ return ret;
+}
+
+#endif
--
1.7.9.5
More information about the samba-technical
mailing list