diff options
| author | Jim McDonough <jmcd@samba.org> | 2009-04-17 09:28:01 +0200 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2009-04-17 09:28:01 +0200 |
| commit | 1214bf606d1cdf3f33b91ffe7cb4c349ce737d68 (patch) | |
| tree | 7294165dc644ddc3860831f02578c63dad7770ef /source3/utils | |
| parent | 75ccf934ac09e5af68cfd5afdd75a1b32ca24287 (diff) | |
| parent | 05ea8daacabe62b6c20770a8518192c44e7eb763 (diff) | |
| download | samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.tar.gz samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.tar.bz2 samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.zip | |
Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_conf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 3fa547baf4..663c5925c7 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -340,6 +340,14 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx, if (!W_ERROR_IS_OK(werr)) { goto cancel; } + + werr = smbconf_transaction_start(conf_ctx); + if (!W_ERROR_IS_OK(werr)) { + d_printf("error starting transaction: %s\n", + win_errstr(werr)); + goto done; + } + werr = import_process_service(c, conf_ctx, service); if (!W_ERROR_IS_OK(werr)) { goto cancel; |