diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 2 | ||||
| -rw-r--r-- | source3/script/mksyms.awk | 8 | ||||
| -rwxr-xr-x | source3/script/mksyms.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index e38f76fcf6..07dde1e408 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -478,7 +478,6 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h, This is only safe because we are in a transaction and this is a persistent database */ ZERO_STRUCT(header); - header.dmaster = get_my_vnn(); } else { memcpy(&header, rec.dptr, sizeof(struct ctdb_ltdb_header)); rec.dsize -= sizeof(struct ctdb_ltdb_header); @@ -492,6 +491,7 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h, SAFE_FREE(rec.dptr); } + header.dmaster = get_my_vnn(); header.rsn++; if (!h->in_replay) { diff --git a/source3/script/mksyms.awk b/source3/script/mksyms.awk index a30bea4d34..94a405ca68 100644 --- a/source3/script/mksyms.awk +++ b/source3/script/mksyms.awk @@ -4,7 +4,7 @@ # Extract symbols to export from C-header files. # output in version-script format for linking shared libraries. # -# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# Copyright (C) 2008 Michael Adam <obnox@samba.org> # BEGIN { inheader=0; @@ -28,7 +28,7 @@ END { current_file=FILENAME } if (inheader) { - if (match($0,"[)][ \t]*[;][ \t]*$")) { + if (match($0,"[)][^()]*[;][ \t]*$")) { inheader = 0; } next; @@ -57,10 +57,10 @@ END { } } -/[_A-Za-z0-9]+[ \t]*[(].*[)][ \t]*;[ \t]*$/ { +/[_A-Za-z0-9]+[ \t]*[(].*[)][^()]*;[ \t]*$/ { sub(/[(].*$/, ""); gsub(/[^ \t]+[ \t]+/, ""); - gsub(/^[*]/, ""); + gsub(/^[*]+/, ""); printf "\t\t%s;\n",$0; next; } diff --git a/source3/script/mksyms.sh b/source3/script/mksyms.sh index 714d55abae..7fb4031e2b 100755 --- a/source3/script/mksyms.sh +++ b/source3/script/mksyms.sh @@ -8,7 +8,7 @@ # # This is the shell wrapper for the mksyms.awk core script. # -# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# Copyright (C) 2008 Michael Adam <obnox@samba.org> # LANG=C; export LANG |