sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s3:fix bug #6371, unsuccessful net conf setparm leaves empty share

Browse Source 
Wrap creation of share and setting of parameter into a transaction.

Michael
This commit is contained in:
Michael Adam
2009-05-17 22:15:02 +02:00
parent 834fc3786e
commit 2722dd357c
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source3/utils/net_conf.c
View File

@ -787,12 +787,19 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
} }
value_str = argv[2]; value_str = argv[2];
werr = smbconf_transaction_start(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error starting transaction: %s\n",
win_errstr(werr));
goto done;
}
if (!smbconf_share_exists(conf_ctx, service)) { if (!smbconf_share_exists(conf_ctx, service)) {
werr = smbconf_create_share(conf_ctx, service); werr = smbconf_create_share(conf_ctx, service);
if (!W_ERROR_IS_OK(werr)) { if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error creating share '%s': %s\n", d_fprintf(stderr, "Error creating share '%s': %s\n",
service, win_errstr(werr)); service, win_errstr(werr));
goto done; goto cancel;
} }
} }
@ -801,10 +808,25 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
if (!W_ERROR_IS_OK(werr)) { if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error setting value '%s': %s\n", d_fprintf(stderr, "Error setting value '%s': %s\n",
param, win_errstr(werr)); param, win_errstr(werr));
goto done; goto cancel;
} }
werr = smbconf_transaction_commit(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error committing transaction: %s\n",
win_errstr(werr));
} else {
ret = 0; ret = 0;
}
goto done;
cancel:
werr = smbconf_transaction_cancel(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error cancelling transaction: %s\n",
win_errstr(werr));
}
done: done:
TALLOC_FREE(mem_ctx); TALLOC_FREE(mem_ctx);