package/network/services/samba36/patches/021-CVE-preparation-v3-6-addition.patch

   1 --- a/source3/librpc/gen_ndr/srv_atsvc.c
   2 +++ b/source3/librpc/gen_ndr/srv_atsvc.c
   3 @@ -51,7 +51,7 @@ static bool api_atsvc_JobAdd(struct pipe
   4
   5         r->out.result = _atsvc_JobAdd(p, r);
   6
   7 -       if (p->rng_fault_state) {
   8 +       if (p->fault_state) {
   9                 talloc_free(r);
  10                 /* Return true here, srv_pipe_hnd.c will take care */
  11                 return true;
  12 @@ -124,7 +124,7 @@ static bool api_atsvc_JobDel(struct pipe
  13
  14         r->out.result = _atsvc_JobDel(p, r);
  15
  16 -       if (p->rng_fault_state) {
  17 +       if (p->fault_state) {
  18                 talloc_free(r);
  19                 /* Return true here, srv_pipe_hnd.c will take care */
  20                 return true;
  21 @@ -206,7 +206,7 @@ static bool api_atsvc_JobEnum(struct pip
  22
  23         r->out.result = _atsvc_JobEnum(p, r);
  24
  25 -       if (p->rng_fault_state) {
  26 +       if (p->fault_state) {
  27                 talloc_free(r);
  28                 /* Return true here, srv_pipe_hnd.c will take care */
  29                 return true;
  30 @@ -286,7 +286,7 @@ static bool api_atsvc_JobGetInfo(struct
  31
  32         r->out.result = _atsvc_JobGetInfo(p, r);
  33
  34 -       if (p->rng_fault_state) {
  35 +       if (p->fault_state) {
  36                 talloc_free(r);
  37                 /* Return true here, srv_pipe_hnd.c will take care */
  38                 return true;
  39 --- a/source3/librpc/gen_ndr/srv_audiosrv.c
  40 +++ b/source3/librpc/gen_ndr/srv_audiosrv.c
  41 @@ -44,7 +44,7 @@ static bool api_audiosrv_CreatezoneFacto
  42
  43         _audiosrv_CreatezoneFactoriesList(p, r);
  44
  45 -       if (p->rng_fault_state) {
  46 +       if (p->fault_state) {
  47                 talloc_free(r);
  48                 /* Return true here, srv_pipe_hnd.c will take care */
  49                 return true;
  50 @@ -117,7 +117,7 @@ static bool api_audiosrv_CreateGfxFactor
  51
  52         _audiosrv_CreateGfxFactoriesList(p, r);
  53
  54 -       if (p->rng_fault_state) {
  55 +       if (p->fault_state) {
  56                 talloc_free(r);
  57                 /* Return true here, srv_pipe_hnd.c will take care */
  58                 return true;
  59 @@ -190,7 +190,7 @@ static bool api_audiosrv_CreateGfxList(s
  60
  61         _audiosrv_CreateGfxList(p, r);
  62
  63 -       if (p->rng_fault_state) {
  64 +       if (p->fault_state) {
  65                 talloc_free(r);
  66                 /* Return true here, srv_pipe_hnd.c will take care */
  67                 return true;
  68 @@ -263,7 +263,7 @@ static bool api_audiosrv_RemoveGfx(struc
  69
  70         _audiosrv_RemoveGfx(p, r);
  71
  72 -       if (p->rng_fault_state) {
  73 +       if (p->fault_state) {
  74                 talloc_free(r);
  75                 /* Return true here, srv_pipe_hnd.c will take care */
  76                 return true;
  77 @@ -336,7 +336,7 @@ static bool api_audiosrv_AddGfx(struct p
  78
  79         _audiosrv_AddGfx(p, r);
  80
  81 -       if (p->rng_fault_state) {
  82 +       if (p->fault_state) {
  83                 talloc_free(r);
  84                 /* Return true here, srv_pipe_hnd.c will take care */
  85                 return true;
  86 @@ -409,7 +409,7 @@ static bool api_audiosrv_ModifyGfx(struc
  87
  88         _audiosrv_ModifyGfx(p, r);
  89
  90 -       if (p->rng_fault_state) {
  91 +       if (p->fault_state) {
  92                 talloc_free(r);
  93                 /* Return true here, srv_pipe_hnd.c will take care */
  94                 return true;
  95 @@ -482,7 +482,7 @@ static bool api_audiosrv_OpenGfx(struct
  96
  97         _audiosrv_OpenGfx(p, r);
  98
  99 -       if (p->rng_fault_state) {
 100 +       if (p->fault_state) {
 101                 talloc_free(r);
 102                 /* Return true here, srv_pipe_hnd.c will take care */
 103                 return true;
 104 @@ -555,7 +555,7 @@ static bool api_audiosrv_Logon(struct pi
 105
 106         _audiosrv_Logon(p, r);
 107
 108 -       if (p->rng_fault_state) {
 109 +       if (p->fault_state) {
 110                 talloc_free(r);
 111                 /* Return true here, srv_pipe_hnd.c will take care */
 112                 return true;
 113 @@ -628,7 +628,7 @@ static bool api_audiosrv_Logoff(struct p
 114
 115         _audiosrv_Logoff(p, r);
 116
 117 -       if (p->rng_fault_state) {
 118 +       if (p->fault_state) {
 119                 talloc_free(r);
 120                 /* Return true here, srv_pipe_hnd.c will take care */
 121                 return true;
 122 @@ -701,7 +701,7 @@ static bool api_audiosrv_RegisterSession
 123
 124         _audiosrv_RegisterSessionNotificationEvent(p, r);
 125
 126 -       if (p->rng_fault_state) {
 127 +       if (p->fault_state) {
 128                 talloc_free(r);
 129                 /* Return true here, srv_pipe_hnd.c will take care */
 130                 return true;
 131 @@ -774,7 +774,7 @@ static bool api_audiosrv_UnregisterSessi
 132
 133         _audiosrv_UnregisterSessionNotificationEvent(p, r);
 134
 135 -       if (p->rng_fault_state) {
 136 +       if (p->fault_state) {
 137                 talloc_free(r);
 138                 /* Return true here, srv_pipe_hnd.c will take care */
 139                 return true;
 140 @@ -847,7 +847,7 @@ static bool api_audiosrv_SessionConnectS
 141
 142         _audiosrv_SessionConnectState(p, r);
 143
 144 -       if (p->rng_fault_state) {
 145 +       if (p->fault_state) {
 146                 talloc_free(r);
 147                 /* Return true here, srv_pipe_hnd.c will take care */
 148                 return true;
 149 @@ -920,7 +920,7 @@ static bool api_audiosrv_DriverOpenDrvRe
 150
 151         _audiosrv_DriverOpenDrvRegKey(p, r);
 152
 153 -       if (p->rng_fault_state) {
 154 +       if (p->fault_state) {
 155                 talloc_free(r);
 156                 /* Return true here, srv_pipe_hnd.c will take care */
 157                 return true;
 158 @@ -993,7 +993,7 @@ static bool api_audiosrv_AdvisePreferred
 159
 160         _audiosrv_AdvisePreferredDeviceChange(p, r);
 161
 162 -       if (p->rng_fault_state) {
 163 +       if (p->fault_state) {
 164                 talloc_free(r);
 165                 /* Return true here, srv_pipe_hnd.c will take care */
 166                 return true;
 167 @@ -1066,7 +1066,7 @@ static bool api_audiosrv_GetPnpInfo(stru
 168
 169         _audiosrv_GetPnpInfo(p, r);
 170
 171 -       if (p->rng_fault_state) {
 172 +       if (p->fault_state) {
 173                 talloc_free(r);
 174                 /* Return true here, srv_pipe_hnd.c will take care */
 175                 return true;
 176 --- a/source3/librpc/gen_ndr/srv_backupkey.c
 177 +++ b/source3/librpc/gen_ndr/srv_backupkey.c
 178 @@ -57,7 +57,7 @@ static bool api_bkrp_BackupKey(struct pi
 179
 180         r->out.result = _bkrp_BackupKey(p, r);
 181
 182 -       if (p->rng_fault_state) {
 183 +       if (p->fault_state) {
 184                 talloc_free(r);
 185                 /* Return true here, srv_pipe_hnd.c will take care */
 186                 return true;
 187 --- a/source3/librpc/gen_ndr/srv_browser.c
 188 +++ b/source3/librpc/gen_ndr/srv_browser.c
 189 @@ -44,7 +44,7 @@ static bool api_BrowserrServerEnum(struc
 190
 191         _BrowserrServerEnum(p, r);
 192
 193 -       if (p->rng_fault_state) {
 194 +       if (p->fault_state) {
 195                 talloc_free(r);
 196                 /* Return true here, srv_pipe_hnd.c will take care */
 197                 return true;
 198 @@ -117,7 +117,7 @@ static bool api_BrowserrDebugCall(struct
 199
 200         _BrowserrDebugCall(p, r);
 201
 202 -       if (p->rng_fault_state) {
 203 +       if (p->fault_state) {
 204                 talloc_free(r);
 205                 /* Return true here, srv_pipe_hnd.c will take care */
 206                 return true;
 207 @@ -198,7 +198,7 @@ static bool api_BrowserrQueryOtherDomain
 208
 209         r->out.result = _BrowserrQueryOtherDomains(p, r);
 210
 211 -       if (p->rng_fault_state) {
 212 +       if (p->fault_state) {
 213                 talloc_free(r);
 214                 /* Return true here, srv_pipe_hnd.c will take care */
 215                 return true;
 216 @@ -271,7 +271,7 @@ static bool api_BrowserrResetNetlogonSta
 217
 218         _BrowserrResetNetlogonState(p, r);
 219
 220 -       if (p->rng_fault_state) {
 221 +       if (p->fault_state) {
 222                 talloc_free(r);
 223                 /* Return true here, srv_pipe_hnd.c will take care */
 224                 return true;
 225 @@ -344,7 +344,7 @@ static bool api_BrowserrDebugTrace(struc
 226
 227         _BrowserrDebugTrace(p, r);
 228
 229 -       if (p->rng_fault_state) {
 230 +       if (p->fault_state) {
 231                 talloc_free(r);
 232                 /* Return true here, srv_pipe_hnd.c will take care */
 233                 return true;
 234 @@ -417,7 +417,7 @@ static bool api_BrowserrQueryStatistics(
 235
 236         _BrowserrQueryStatistics(p, r);
 237
 238 -       if (p->rng_fault_state) {
 239 +       if (p->fault_state) {
 240                 talloc_free(r);
 241                 /* Return true here, srv_pipe_hnd.c will take care */
 242                 return true;
 243 @@ -490,7 +490,7 @@ static bool api_BrowserResetStatistics(s
 244
 245         _BrowserResetStatistics(p, r);
 246
 247 -       if (p->rng_fault_state) {
 248 +       if (p->fault_state) {
 249                 talloc_free(r);
 250                 /* Return true here, srv_pipe_hnd.c will take care */
 251                 return true;
 252 @@ -563,7 +563,7 @@ static bool api_NetrBrowserStatisticsCle
 253
 254         _NetrBrowserStatisticsClear(p, r);
 255
 256 -       if (p->rng_fault_state) {
 257 +       if (p->fault_state) {
 258                 talloc_free(r);
 259                 /* Return true here, srv_pipe_hnd.c will take care */
 260                 return true;
 261 @@ -636,7 +636,7 @@ static bool api_NetrBrowserStatisticsGet
 262
 263         _NetrBrowserStatisticsGet(p, r);
 264
 265 -       if (p->rng_fault_state) {
 266 +       if (p->fault_state) {
 267                 talloc_free(r);
 268                 /* Return true here, srv_pipe_hnd.c will take care */
 269                 return true;
 270 @@ -709,7 +709,7 @@ static bool api_BrowserrSetNetlogonState
 271
 272         _BrowserrSetNetlogonState(p, r);
 273
 274 -       if (p->rng_fault_state) {
 275 +       if (p->fault_state) {
 276                 talloc_free(r);
 277                 /* Return true here, srv_pipe_hnd.c will take care */
 278                 return true;
 279 @@ -782,7 +782,7 @@ static bool api_BrowserrQueryEmulatedDom
 280
 281         _BrowserrQueryEmulatedDomains(p, r);
 282
 283 -       if (p->rng_fault_state) {
 284 +       if (p->fault_state) {
 285                 talloc_free(r);
 286                 /* Return true here, srv_pipe_hnd.c will take care */
 287                 return true;
 288 @@ -855,7 +855,7 @@ static bool api_BrowserrServerEnumEx(str
 289
 290         _BrowserrServerEnumEx(p, r);
 291
 292 -       if (p->rng_fault_state) {
 293 +       if (p->fault_state) {
 294                 talloc_free(r);
 295                 /* Return true here, srv_pipe_hnd.c will take care */
 296                 return true;
 297 --- a/source3/librpc/gen_ndr/srv_dbgidl.c
 298 +++ b/source3/librpc/gen_ndr/srv_dbgidl.c
 299 @@ -44,7 +44,7 @@ static bool api_dummy_dbgidl(struct pipe
 300
 301         _dummy_dbgidl(p, r);
 302
 303 -       if (p->rng_fault_state) {
 304 +       if (p->fault_state) {
 305                 talloc_free(r);
 306                 /* Return true here, srv_pipe_hnd.c will take care */
 307                 return true;
 308 --- a/source3/librpc/gen_ndr/srv_dcom.c
 309 +++ b/source3/librpc/gen_ndr/srv_dcom.c
 310 @@ -44,7 +44,7 @@ static bool api_UseProtSeq(struct pipes_
 311
 312         _UseProtSeq(p, r);
 313
 314 -       if (p->rng_fault_state) {
 315 +       if (p->fault_state) {
 316                 talloc_free(r);
 317                 /* Return true here, srv_pipe_hnd.c will take care */
 318                 return true;
 319 @@ -117,7 +117,7 @@ static bool api_GetCustomProtseqInfo(str
 320
 321         _GetCustomProtseqInfo(p, r);
 322
 323 -       if (p->rng_fault_state) {
 324 +       if (p->fault_state) {
 325                 talloc_free(r);
 326                 /* Return true here, srv_pipe_hnd.c will take care */
 327                 return true;
 328 @@ -190,7 +190,7 @@ static bool api_UpdateResolverBindings(s
 329
 330         _UpdateResolverBindings(p, r);
 331
 332 -       if (p->rng_fault_state) {
 333 +       if (p->fault_state) {
 334                 talloc_free(r);
 335                 /* Return true here, srv_pipe_hnd.c will take care */
 336                 return true;
 337 @@ -300,7 +300,7 @@ static bool api_QueryInterface(struct pi
 338
 339         r->out.result = _QueryInterface(p, r);
 340
 341 -       if (p->rng_fault_state) {
 342 +       if (p->fault_state) {
 343                 talloc_free(r);
 344                 /* Return true here, srv_pipe_hnd.c will take care */
 345                 return true;
 346 @@ -380,7 +380,7 @@ static bool api_AddRef(struct pipes_stru
 347
 348         r->out.result = _AddRef(p, r);
 349
 350 -       if (p->rng_fault_state) {
 351 +       if (p->fault_state) {
 352                 talloc_free(r);
 353                 /* Return true here, srv_pipe_hnd.c will take care */
 354                 return true;
 355 @@ -460,7 +460,7 @@ static bool api_Release(struct pipes_str
 356
 357         r->out.result = _Release(p, r);
 358
 359 -       if (p->rng_fault_state) {
 360 +       if (p->fault_state) {
 361                 talloc_free(r);
 362                 /* Return true here, srv_pipe_hnd.c will take care */
 363                 return true;
 364 @@ -570,7 +570,7 @@ static bool api_CreateInstance(struct pi
 365
 366         r->out.result = _CreateInstance(p, r);
 367
 368 -       if (p->rng_fault_state) {
 369 +       if (p->fault_state) {
 370                 talloc_free(r);
 371                 /* Return true here, srv_pipe_hnd.c will take care */
 372                 return true;
 373 @@ -650,7 +650,7 @@ static bool api_RemoteCreateInstance(str
 374
 375         r->out.result = _RemoteCreateInstance(p, r);
 376
 377 -       if (p->rng_fault_state) {
 378 +       if (p->fault_state) {
 379                 talloc_free(r);
 380                 /* Return true here, srv_pipe_hnd.c will take care */
 381                 return true;
 382 @@ -730,7 +730,7 @@ static bool api_LockServer(struct pipes_
 383
 384         r->out.result = _LockServer(p, r);
 385
 386 -       if (p->rng_fault_state) {
 387 +       if (p->fault_state) {
 388                 talloc_free(r);
 389                 /* Return true here, srv_pipe_hnd.c will take care */
 390                 return true;
 391 @@ -810,7 +810,7 @@ static bool api_RemoteLockServer(struct
 392
 393         r->out.result = _RemoteLockServer(p, r);
 394
 395 -       if (p->rng_fault_state) {
 396 +       if (p->fault_state) {
 397                 talloc_free(r);
 398                 /* Return true here, srv_pipe_hnd.c will take care */
 399                 return true;
 400 @@ -921,7 +921,7 @@ static bool api_RemQueryInterface(struct
 401
 402         r->out.result = _RemQueryInterface(p, r);
 403
 404 -       if (p->rng_fault_state) {
 405 +       if (p->fault_state) {
 406                 talloc_free(r);
 407                 /* Return true here, srv_pipe_hnd.c will take care */
 408                 return true;
 409 @@ -1007,7 +1007,7 @@ static bool api_RemAddRef(struct pipes_s
 410
 411         r->out.result = _RemAddRef(p, r);
 412
 413 -       if (p->rng_fault_state) {
 414 +       if (p->fault_state) {
 415                 talloc_free(r);
 416                 /* Return true here, srv_pipe_hnd.c will take care */
 417                 return true;
 418 @@ -1087,7 +1087,7 @@ static bool api_RemRelease(struct pipes_
 419
 420         r->out.result = _RemRelease(p, r);
 421
 422 -       if (p->rng_fault_state) {
 423 +       if (p->fault_state) {
 424                 talloc_free(r);
 425                 /* Return true here, srv_pipe_hnd.c will take care */
 426                 return true;
 427 @@ -1197,7 +1197,7 @@ static bool api_GetClassObject(struct pi
 428
 429         _GetClassObject(p, r);
 430
 431 -       if (p->rng_fault_state) {
 432 +       if (p->fault_state) {
 433                 talloc_free(r);
 434                 /* Return true here, srv_pipe_hnd.c will take care */
 435                 return true;
 436 @@ -1299,7 +1299,7 @@ static bool api_ISCMLocalActivator_Creat
 437
 438         r->out.result = _ISCMLocalActivator_CreateInstance(p, r);
 439
 440 -       if (p->rng_fault_state) {
 441 +       if (p->fault_state) {
 442                 talloc_free(r);
 443                 /* Return true here, srv_pipe_hnd.c will take care */
 444                 return true;
 445 @@ -1394,7 +1394,7 @@ static bool api_IMachineLocalActivator_f
 446
 447         r->out.result = _IMachineLocalActivator_foo(p, r);
 448
 449 -       if (p->rng_fault_state) {
 450 +       if (p->fault_state) {
 451                 talloc_free(r);
 452                 /* Return true here, srv_pipe_hnd.c will take care */
 453                 return true;
 454 @@ -1489,7 +1489,7 @@ static bool api_ILocalObjectExporter_Foo
 455
 456         r->out.result = _ILocalObjectExporter_Foo(p, r);
 457
 458 -       if (p->rng_fault_state) {
 459 +       if (p->fault_state) {
 460                 talloc_free(r);
 461                 /* Return true here, srv_pipe_hnd.c will take care */
 462                 return true;
 463 @@ -1603,7 +1603,7 @@ static bool api_ISystemActivatorRemoteCr
 464
 465         r->out.result = _ISystemActivatorRemoteCreateInstance(p, r);
 466
 467 -       if (p->rng_fault_state) {
 468 +       if (p->fault_state) {
 469                 talloc_free(r);
 470                 /* Return true here, srv_pipe_hnd.c will take care */
 471                 return true;
 472 @@ -1717,7 +1717,7 @@ static bool api_RemQueryInterface2(struc
 473
 474         r->out.result = _RemQueryInterface2(p, r);
 475
 476 -       if (p->rng_fault_state) {
 477 +       if (p->fault_state) {
 478                 talloc_free(r);
 479                 /* Return true here, srv_pipe_hnd.c will take care */
 480                 return true;
 481 @@ -1825,7 +1825,7 @@ static bool api_GetTypeInfoCount(struct
 482
 483         r->out.result = _GetTypeInfoCount(p, r);
 484
 485 -       if (p->rng_fault_state) {
 486 +       if (p->fault_state) {
 487                 talloc_free(r);
 488                 /* Return true here, srv_pipe_hnd.c will take care */
 489                 return true;
 490 @@ -1911,7 +1911,7 @@ static bool api_GetTypeInfo(struct pipes
 491
 492         r->out.result = _GetTypeInfo(p, r);
 493
 494 -       if (p->rng_fault_state) {
 495 +       if (p->fault_state) {
 496                 talloc_free(r);
 497                 /* Return true here, srv_pipe_hnd.c will take care */
 498                 return true;
 499 @@ -1997,7 +1997,7 @@ static bool api_GetIDsOfNames(struct pip
 500
 501         r->out.result = _GetIDsOfNames(p, r);
 502
 503 -       if (p->rng_fault_state) {
 504 +       if (p->fault_state) {
 505                 talloc_free(r);
 506                 /* Return true here, srv_pipe_hnd.c will take care */
 507                 return true;
 508 @@ -2096,7 +2096,7 @@ static bool api_Invoke(struct pipes_stru
 509
 510         r->out.result = _Invoke(p, r);
 511
 512 -       if (p->rng_fault_state) {
 513 +       if (p->fault_state) {
 514                 talloc_free(r);
 515                 /* Return true here, srv_pipe_hnd.c will take care */
 516                 return true;
 517 @@ -2201,7 +2201,7 @@ static bool api_MarshalInterface(struct
 518
 519         r->out.result = _MarshalInterface(p, r);
 520
 521 -       if (p->rng_fault_state) {
 522 +       if (p->fault_state) {
 523                 talloc_free(r);
 524                 /* Return true here, srv_pipe_hnd.c will take care */
 525                 return true;
 526 @@ -2281,7 +2281,7 @@ static bool api_UnMarshalInterface(struc
 527
 528         r->out.result = _UnMarshalInterface(p, r);
 529
 530 -       if (p->rng_fault_state) {
 531 +       if (p->fault_state) {
 532                 talloc_free(r);
 533                 /* Return true here, srv_pipe_hnd.c will take care */
 534                 return true;
 535 @@ -2384,7 +2384,7 @@ static bool api_MakeCoffee(struct pipes_
 536
 537         r->out.result = _MakeCoffee(p, r);
 538
 539 -       if (p->rng_fault_state) {
 540 +       if (p->fault_state) {
 541                 talloc_free(r);
 542                 /* Return true here, srv_pipe_hnd.c will take care */
 543                 return true;
 544 @@ -2498,7 +2498,7 @@ static bool api_Read(struct pipes_struct
 545
 546         r->out.result = _Read(p, r);
 547
 548 -       if (p->rng_fault_state) {
 549 +       if (p->fault_state) {
 550                 talloc_free(r);
 551                 /* Return true here, srv_pipe_hnd.c will take care */
 552                 return true;
 553 @@ -2584,7 +2584,7 @@ static bool api_Write(struct pipes_struc
 554
 555         r->out.result = _Write(p, r);
 556
 557 -       if (p->rng_fault_state) {
 558 +       if (p->fault_state) {
 559                 talloc_free(r);
 560                 /* Return true here, srv_pipe_hnd.c will take care */
 561                 return true;
 562 --- a/source3/librpc/gen_ndr/srv_dfsblobs.c
 563 +++ b/source3/librpc/gen_ndr/srv_dfsblobs.c
 564 @@ -51,7 +51,7 @@ static bool api_dfs_GetDFSReferral(struc
 565
 566         _dfs_GetDFSReferral(p, r);
 567
 568 -       if (p->rng_fault_state) {
 569 +       if (p->fault_state) {
 570                 talloc_free(r);
 571                 /* Return true here, srv_pipe_hnd.c will take care */
 572                 return true;
 573 --- a/source3/librpc/gen_ndr/srv_dfs.c
 574 +++ b/source3/librpc/gen_ndr/srv_dfs.c
 575 @@ -51,7 +51,7 @@ static bool api_dfs_GetManagerVersion(st
 576
 577         _dfs_GetManagerVersion(p, r);
 578
 579 -       if (p->rng_fault_state) {
 580 +       if (p->fault_state) {
 581                 talloc_free(r);
 582                 /* Return true here, srv_pipe_hnd.c will take care */
 583                 return true;
 584 @@ -124,7 +124,7 @@ static bool api_dfs_Add(struct pipes_str
 585
 586         r->out.result = _dfs_Add(p, r);
 587
 588 -       if (p->rng_fault_state) {
 589 +       if (p->fault_state) {
 590                 talloc_free(r);
 591                 /* Return true here, srv_pipe_hnd.c will take care */
 592                 return true;
 593 @@ -197,7 +197,7 @@ static bool api_dfs_Remove(struct pipes_
 594
 595         r->out.result = _dfs_Remove(p, r);
 596
 597 -       if (p->rng_fault_state) {
 598 +       if (p->fault_state) {
 599                 talloc_free(r);
 600                 /* Return true here, srv_pipe_hnd.c will take care */
 601                 return true;
 602 @@ -270,7 +270,7 @@ static bool api_dfs_SetInfo(struct pipes
 603
 604         r->out.result = _dfs_SetInfo(p, r);
 605
 606 -       if (p->rng_fault_state) {
 607 +       if (p->fault_state) {
 608                 talloc_free(r);
 609                 /* Return true here, srv_pipe_hnd.c will take care */
 610                 return true;
 611 @@ -350,7 +350,7 @@ static bool api_dfs_GetInfo(struct pipes
 612
 613         r->out.result = _dfs_GetInfo(p, r);
 614
 615 -       if (p->rng_fault_state) {
 616 +       if (p->fault_state) {
 617                 talloc_free(r);
 618                 /* Return true here, srv_pipe_hnd.c will take care */
 619                 return true;
 620 @@ -426,7 +426,7 @@ static bool api_dfs_Enum(struct pipes_st
 621         r->out.total = r->in.total;
 622         r->out.result = _dfs_Enum(p, r);
 623
 624 -       if (p->rng_fault_state) {
 625 +       if (p->fault_state) {
 626                 talloc_free(r);
 627                 /* Return true here, srv_pipe_hnd.c will take care */
 628                 return true;
 629 @@ -499,7 +499,7 @@ static bool api_dfs_Rename(struct pipes_
 630
 631         r->out.result = _dfs_Rename(p, r);
 632
 633 -       if (p->rng_fault_state) {
 634 +       if (p->fault_state) {
 635                 talloc_free(r);
 636                 /* Return true here, srv_pipe_hnd.c will take care */
 637                 return true;
 638 @@ -572,7 +572,7 @@ static bool api_dfs_Move(struct pipes_st
 639
 640         r->out.result = _dfs_Move(p, r);
 641
 642 -       if (p->rng_fault_state) {
 643 +       if (p->fault_state) {
 644                 talloc_free(r);
 645                 /* Return true here, srv_pipe_hnd.c will take care */
 646                 return true;
 647 @@ -645,7 +645,7 @@ static bool api_dfs_ManagerGetConfigInfo
 648
 649         r->out.result = _dfs_ManagerGetConfigInfo(p, r);
 650
 651 -       if (p->rng_fault_state) {
 652 +       if (p->fault_state) {
 653                 talloc_free(r);
 654                 /* Return true here, srv_pipe_hnd.c will take care */
 655                 return true;
 656 @@ -718,7 +718,7 @@ static bool api_dfs_ManagerSendSiteInfo(
 657
 658         r->out.result = _dfs_ManagerSendSiteInfo(p, r);
 659
 660 -       if (p->rng_fault_state) {
 661 +       if (p->fault_state) {
 662                 talloc_free(r);
 663                 /* Return true here, srv_pipe_hnd.c will take care */
 664                 return true;
 665 @@ -793,7 +793,7 @@ static bool api_dfs_AddFtRoot(struct pip
 666         r->out.unknown2 = r->in.unknown2;
 667         r->out.result = _dfs_AddFtRoot(p, r);
 668
 669 -       if (p->rng_fault_state) {
 670 +       if (p->fault_state) {
 671                 talloc_free(r);
 672                 /* Return true here, srv_pipe_hnd.c will take care */
 673                 return true;
 674 @@ -868,7 +868,7 @@ static bool api_dfs_RemoveFtRoot(struct
 675         r->out.unknown = r->in.unknown;
 676         r->out.result = _dfs_RemoveFtRoot(p, r);
 677
 678 -       if (p->rng_fault_state) {
 679 +       if (p->fault_state) {
 680                 talloc_free(r);
 681                 /* Return true here, srv_pipe_hnd.c will take care */
 682                 return true;
 683 @@ -941,7 +941,7 @@ static bool api_dfs_AddStdRoot(struct pi
 684
 685         r->out.result = _dfs_AddStdRoot(p, r);
 686
 687 -       if (p->rng_fault_state) {
 688 +       if (p->fault_state) {
 689                 talloc_free(r);
 690                 /* Return true here, srv_pipe_hnd.c will take care */
 691                 return true;
 692 @@ -1014,7 +1014,7 @@ static bool api_dfs_RemoveStdRoot(struct
 693
 694         r->out.result = _dfs_RemoveStdRoot(p, r);
 695
 696 -       if (p->rng_fault_state) {
 697 +       if (p->fault_state) {
 698                 talloc_free(r);
 699                 /* Return true here, srv_pipe_hnd.c will take care */
 700                 return true;
 701 @@ -1087,7 +1087,7 @@ static bool api_dfs_ManagerInitialize(st
 702
 703         r->out.result = _dfs_ManagerInitialize(p, r);
 704
 705 -       if (p->rng_fault_state) {
 706 +       if (p->fault_state) {
 707                 talloc_free(r);
 708                 /* Return true here, srv_pipe_hnd.c will take care */
 709                 return true;
 710 @@ -1160,7 +1160,7 @@ static bool api_dfs_AddStdRootForced(str
 711
 712         r->out.result = _dfs_AddStdRootForced(p, r);
 713
 714 -       if (p->rng_fault_state) {
 715 +       if (p->fault_state) {
 716                 talloc_free(r);
 717                 /* Return true here, srv_pipe_hnd.c will take care */
 718                 return true;
 719 @@ -1237,7 +1237,7 @@ static bool api_dfs_GetDcAddress(struct
 720         r->out.ttl = r->in.ttl;
 721         r->out.result = _dfs_GetDcAddress(p, r);
 722
 723 -       if (p->rng_fault_state) {
 724 +       if (p->fault_state) {
 725                 talloc_free(r);
 726                 /* Return true here, srv_pipe_hnd.c will take care */
 727                 return true;
 728 @@ -1310,7 +1310,7 @@ static bool api_dfs_SetDcAddress(struct
 729
 730         r->out.result = _dfs_SetDcAddress(p, r);
 731
 732 -       if (p->rng_fault_state) {
 733 +       if (p->fault_state) {
 734                 talloc_free(r);
 735                 /* Return true here, srv_pipe_hnd.c will take care */
 736                 return true;
 737 @@ -1383,7 +1383,7 @@ static bool api_dfs_FlushFtTable(struct
 738
 739         r->out.result = _dfs_FlushFtTable(p, r);
 740
 741 -       if (p->rng_fault_state) {
 742 +       if (p->fault_state) {
 743                 talloc_free(r);
 744                 /* Return true here, srv_pipe_hnd.c will take care */
 745                 return true;
 746 @@ -1456,7 +1456,7 @@ static bool api_dfs_Add2(struct pipes_st
 747
 748         r->out.result = _dfs_Add2(p, r);
 749
 750 -       if (p->rng_fault_state) {
 751 +       if (p->fault_state) {
 752                 talloc_free(r);
 753                 /* Return true here, srv_pipe_hnd.c will take care */
 754                 return true;
 755 @@ -1529,7 +1529,7 @@ static bool api_dfs_Remove2(struct pipes
 756
 757         r->out.result = _dfs_Remove2(p, r);
 758
 759 -       if (p->rng_fault_state) {
 760 +       if (p->fault_state) {
 761                 talloc_free(r);
 762                 /* Return true here, srv_pipe_hnd.c will take care */
 763                 return true;
 764 @@ -1605,7 +1605,7 @@ static bool api_dfs_EnumEx(struct pipes_
 765         r->out.total = r->in.total;
 766         r->out.result = _dfs_EnumEx(p, r);
 767
 768 -       if (p->rng_fault_state) {
 769 +       if (p->fault_state) {
 770                 talloc_free(r);
 771                 /* Return true here, srv_pipe_hnd.c will take care */
 772                 return true;
 773 @@ -1678,7 +1678,7 @@ static bool api_dfs_SetInfo2(struct pipe
 774
 775         r->out.result = _dfs_SetInfo2(p, r);
 776
 777 -       if (p->rng_fault_state) {
 778 +       if (p->fault_state) {
 779                 talloc_free(r);
 780                 /* Return true here, srv_pipe_hnd.c will take care */
 781                 return true;
 782 --- a/source3/librpc/gen_ndr/srv_dns.c
 783 +++ b/source3/librpc/gen_ndr/srv_dns.c
 784 @@ -44,7 +44,7 @@ static bool api_decode_dns_name_packet(s
 785
 786         _decode_dns_name_packet(p, r);
 787
 788 -       if (p->rng_fault_state) {
 789 +       if (p->fault_state) {
 790                 talloc_free(r);
 791                 /* Return true here, srv_pipe_hnd.c will take care */
 792                 return true;
 793 --- a/source3/librpc/gen_ndr/srv_dnsp.c
 794 +++ b/source3/librpc/gen_ndr/srv_dnsp.c
 795 @@ -44,7 +44,7 @@ static bool api_decode_DnssrvRpcRecord(s
 796
 797         _decode_DnssrvRpcRecord(p, r);
 798
 799 -       if (p->rng_fault_state) {
 800 +       if (p->fault_state) {
 801                 talloc_free(r);
 802                 /* Return true here, srv_pipe_hnd.c will take care */
 803                 return true;
 804 --- a/source3/librpc/gen_ndr/srv_dnsserver.c
 805 +++ b/source3/librpc/gen_ndr/srv_dnsserver.c
 806 @@ -44,7 +44,7 @@ static bool api_dnsserver_foo(struct pip
 807
 808         _dnsserver_foo(p, r);
 809
 810 -       if (p->rng_fault_state) {
 811 +       if (p->fault_state) {
 812                 talloc_free(r);
 813                 /* Return true here, srv_pipe_hnd.c will take care */
 814                 return true;
 815 --- a/source3/librpc/gen_ndr/srv_drsblobs.c
 816 +++ b/source3/librpc/gen_ndr/srv_drsblobs.c
 817 @@ -44,7 +44,7 @@ static bool api_decode_replPropertyMetaD
 818
 819         _decode_replPropertyMetaData(p, r);
 820
 821 -       if (p->rng_fault_state) {
 822 +       if (p->fault_state) {
 823                 talloc_free(r);
 824                 /* Return true here, srv_pipe_hnd.c will take care */
 825                 return true;
 826 @@ -117,7 +117,7 @@ static bool api_decode_replUpToDateVecto
 827
 828         _decode_replUpToDateVector(p, r);
 829
 830 -       if (p->rng_fault_state) {
 831 +       if (p->fault_state) {
 832                 talloc_free(r);
 833                 /* Return true here, srv_pipe_hnd.c will take care */
 834                 return true;
 835 @@ -190,7 +190,7 @@ static bool api_decode_repsFromTo(struct
 836
 837         _decode_repsFromTo(p, r);
 838
 839 -       if (p->rng_fault_state) {
 840 +       if (p->fault_state) {
 841                 talloc_free(r);
 842                 /* Return true here, srv_pipe_hnd.c will take care */
 843                 return true;
 844 @@ -263,7 +263,7 @@ static bool api_decode_partialAttributeS
 845
 846         _decode_partialAttributeSet(p, r);
 847
 848 -       if (p->rng_fault_state) {
 849 +       if (p->fault_state) {
 850                 talloc_free(r);
 851                 /* Return true here, srv_pipe_hnd.c will take care */
 852                 return true;
 853 @@ -336,7 +336,7 @@ static bool api_decode_prefixMap(struct
 854
 855         _decode_prefixMap(p, r);
 856
 857 -       if (p->rng_fault_state) {
 858 +       if (p->fault_state) {
 859                 talloc_free(r);
 860                 /* Return true here, srv_pipe_hnd.c will take care */
 861                 return true;
 862 @@ -409,7 +409,7 @@ static bool api_decode_ldapControlDirSyn
 863
 864         _decode_ldapControlDirSync(p, r);
 865
 866 -       if (p->rng_fault_state) {
 867 +       if (p->fault_state) {
 868                 talloc_free(r);
 869                 /* Return true here, srv_pipe_hnd.c will take care */
 870                 return true;
 871 @@ -482,7 +482,7 @@ static bool api_decode_supplementalCrede
 872
 873         _decode_supplementalCredentials(p, r);
 874
 875 -       if (p->rng_fault_state) {
 876 +       if (p->fault_state) {
 877                 talloc_free(r);
 878                 /* Return true here, srv_pipe_hnd.c will take care */
 879                 return true;
 880 @@ -555,7 +555,7 @@ static bool api_decode_Packages(struct p
 881
 882         _decode_Packages(p, r);
 883
 884 -       if (p->rng_fault_state) {
 885 +       if (p->fault_state) {
 886                 talloc_free(r);
 887                 /* Return true here, srv_pipe_hnd.c will take care */
 888                 return true;
 889 @@ -628,7 +628,7 @@ static bool api_decode_PrimaryKerberos(s
 890
 891         _decode_PrimaryKerberos(p, r);
 892
 893 -       if (p->rng_fault_state) {
 894 +       if (p->fault_state) {
 895                 talloc_free(r);
 896                 /* Return true here, srv_pipe_hnd.c will take care */
 897                 return true;
 898 @@ -701,7 +701,7 @@ static bool api_decode_PrimaryCLEARTEXT(
 899
 900         _decode_PrimaryCLEARTEXT(p, r);
 901
 902 -       if (p->rng_fault_state) {
 903 +       if (p->fault_state) {
 904                 talloc_free(r);
 905                 /* Return true here, srv_pipe_hnd.c will take care */
 906                 return true;
 907 @@ -774,7 +774,7 @@ static bool api_decode_PrimaryWDigest(st
 908
 909         _decode_PrimaryWDigest(p, r);
 910
 911 -       if (p->rng_fault_state) {
 912 +       if (p->fault_state) {
 913                 talloc_free(r);
 914                 /* Return true here, srv_pipe_hnd.c will take care */
 915                 return true;
 916 @@ -847,7 +847,7 @@ static bool api_decode_trustAuthInOut(st
 917
 918         _decode_trustAuthInOut(p, r);
 919
 920 -       if (p->rng_fault_state) {
 921 +       if (p->fault_state) {
 922                 talloc_free(r);
 923                 /* Return true here, srv_pipe_hnd.c will take care */
 924                 return true;
 925 @@ -920,7 +920,7 @@ static bool api_decode_trustDomainPasswo
 926
 927         _decode_trustDomainPasswords(p, r);
 928
 929 -       if (p->rng_fault_state) {
 930 +       if (p->fault_state) {
 931                 talloc_free(r);
 932                 /* Return true here, srv_pipe_hnd.c will take care */
 933                 return true;
 934 @@ -993,7 +993,7 @@ static bool api_decode_ExtendedErrorInfo
 935
 936         _decode_ExtendedErrorInfo(p, r);
 937
 938 -       if (p->rng_fault_state) {
 939 +       if (p->fault_state) {
 940                 talloc_free(r);
 941                 /* Return true here, srv_pipe_hnd.c will take care */
 942                 return true;
 943 @@ -1066,7 +1066,7 @@ static bool api_decode_ForestTrustInfo(s
 944
 945         _decode_ForestTrustInfo(p, r);
 946
 947 -       if (p->rng_fault_state) {
 948 +       if (p->fault_state) {
 949                 talloc_free(r);
 950                 /* Return true here, srv_pipe_hnd.c will take care */
 951                 return true;
 952 --- a/source3/librpc/gen_ndr/srv_drsuapi.c
 953 +++ b/source3/librpc/gen_ndr/srv_drsuapi.c
 954 @@ -52,7 +52,7 @@ static bool api_drsuapi_DsBind(struct pi
 955
 956         r->out.result = _drsuapi_DsBind(p, r);
 957
 958 -       if (p->rng_fault_state) {
 959 +       if (p->fault_state) {
 960                 talloc_free(r);
 961                 /* Return true here, srv_pipe_hnd.c will take care */
 962                 return true;
 963 @@ -127,7 +127,7 @@ static bool api_drsuapi_DsUnbind(struct
 964         r->out.bind_handle = r->in.bind_handle;
 965         r->out.result = _drsuapi_DsUnbind(p, r);
 966
 967 -       if (p->rng_fault_state) {
 968 +       if (p->fault_state) {
 969                 talloc_free(r);
 970                 /* Return true here, srv_pipe_hnd.c will take care */
 971                 return true;
 972 @@ -200,7 +200,7 @@ static bool api_drsuapi_DsReplicaSync(st
 973
 974         r->out.result = _drsuapi_DsReplicaSync(p, r);
 975
 976 -       if (p->rng_fault_state) {
 977 +       if (p->fault_state) {
 978                 talloc_free(r);
 979                 /* Return true here, srv_pipe_hnd.c will take care */
 980                 return true;
 981 @@ -286,7 +286,7 @@ static bool api_drsuapi_DsGetNCChanges(s
 982
 983         r->out.result = _drsuapi_DsGetNCChanges(p, r);
 984
 985 -       if (p->rng_fault_state) {
 986 +       if (p->fault_state) {
 987                 talloc_free(r);
 988                 /* Return true here, srv_pipe_hnd.c will take care */
 989                 return true;
 990 @@ -359,7 +359,7 @@ static bool api_drsuapi_DsReplicaUpdateR
 991
 992         r->out.result = _drsuapi_DsReplicaUpdateRefs(p, r);
 993
 994 -       if (p->rng_fault_state) {
 995 +       if (p->fault_state) {
 996                 talloc_free(r);
 997                 /* Return true here, srv_pipe_hnd.c will take care */
 998                 return true;
 999 @@ -432,7 +432,7 @@ static bool api_drsuapi_DsReplicaAdd(str
1000
1001         r->out.result = _drsuapi_DsReplicaAdd(p, r);
1002
1003 -       if (p->rng_fault_state) {
1004 +       if (p->fault_state) {
1005                 talloc_free(r);
1006                 /* Return true here, srv_pipe_hnd.c will take care */
1007                 return true;
1008 @@ -505,7 +505,7 @@ static bool api_drsuapi_DsReplicaDel(str
1009
1010         r->out.result = _drsuapi_DsReplicaDel(p, r);
1011
1012 -       if (p->rng_fault_state) {
1013 +       if (p->fault_state) {
1014                 talloc_free(r);
1015                 /* Return true here, srv_pipe_hnd.c will take care */
1016                 return true;
1017 @@ -578,7 +578,7 @@ static bool api_drsuapi_DsReplicaMod(str
1018
1019         r->out.result = _drsuapi_DsReplicaMod(p, r);
1020
1021 -       if (p->rng_fault_state) {
1022 +       if (p->fault_state) {
1023                 talloc_free(r);
1024                 /* Return true here, srv_pipe_hnd.c will take care */
1025                 return true;
1026 @@ -651,7 +651,7 @@ static bool api_DRSUAPI_VERIFY_NAMES(str
1027
1028         r->out.result = _DRSUAPI_VERIFY_NAMES(p, r);
1029
1030 -       if (p->rng_fault_state) {
1031 +       if (p->fault_state) {
1032                 talloc_free(r);
1033                 /* Return true here, srv_pipe_hnd.c will take care */
1034                 return true;
1035 @@ -737,7 +737,7 @@ static bool api_drsuapi_DsGetMemberships
1036
1037         r->out.result = _drsuapi_DsGetMemberships(p, r);
1038
1039 -       if (p->rng_fault_state) {
1040 +       if (p->fault_state) {
1041                 talloc_free(r);
1042                 /* Return true here, srv_pipe_hnd.c will take care */
1043                 return true;
1044 @@ -810,7 +810,7 @@ static bool api_DRSUAPI_INTER_DOMAIN_MOV
1045
1046         r->out.result = _DRSUAPI_INTER_DOMAIN_MOVE(p, r);
1047
1048 -       if (p->rng_fault_state) {
1049 +       if (p->fault_state) {
1050                 talloc_free(r);
1051                 /* Return true here, srv_pipe_hnd.c will take care */
1052                 return true;
1053 @@ -896,7 +896,7 @@ static bool api_drsuapi_DsGetNT4ChangeLo
1054
1055         r->out.result = _drsuapi_DsGetNT4ChangeLog(p, r);
1056
1057 -       if (p->rng_fault_state) {
1058 +       if (p->fault_state) {
1059                 talloc_free(r);
1060                 /* Return true here, srv_pipe_hnd.c will take care */
1061                 return true;
1062 @@ -982,7 +982,7 @@ static bool api_drsuapi_DsCrackNames(str
1063
1064         r->out.result = _drsuapi_DsCrackNames(p, r);
1065
1066 -       if (p->rng_fault_state) {
1067 +       if (p->fault_state) {
1068                 talloc_free(r);
1069                 /* Return true here, srv_pipe_hnd.c will take care */
1070                 return true;
1071 @@ -1068,7 +1068,7 @@ static bool api_drsuapi_DsWriteAccountSp
1072
1073         r->out.result = _drsuapi_DsWriteAccountSpn(p, r);
1074
1075 -       if (p->rng_fault_state) {
1076 +       if (p->fault_state) {
1077                 talloc_free(r);
1078                 /* Return true here, srv_pipe_hnd.c will take care */
1079                 return true;
1080 @@ -1154,7 +1154,7 @@ static bool api_drsuapi_DsRemoveDSServer
1081
1082         r->out.result = _drsuapi_DsRemoveDSServer(p, r);
1083
1084 -       if (p->rng_fault_state) {
1085 +       if (p->fault_state) {
1086                 talloc_free(r);
1087                 /* Return true here, srv_pipe_hnd.c will take care */
1088                 return true;
1089 @@ -1227,7 +1227,7 @@ static bool api_DRSUAPI_REMOVE_DS_DOMAIN
1090
1091         r->out.result = _DRSUAPI_REMOVE_DS_DOMAIN(p, r);
1092
1093 -       if (p->rng_fault_state) {
1094 +       if (p->fault_state) {
1095                 talloc_free(r);
1096                 /* Return true here, srv_pipe_hnd.c will take care */
1097                 return true;
1098 @@ -1313,7 +1313,7 @@ static bool api_drsuapi_DsGetDomainContr
1099
1100         r->out.result = _drsuapi_DsGetDomainControllerInfo(p, r);
1101
1102 -       if (p->rng_fault_state) {
1103 +       if (p->fault_state) {
1104                 talloc_free(r);
1105                 /* Return true here, srv_pipe_hnd.c will take care */
1106                 return true;
1107 @@ -1399,7 +1399,7 @@ static bool api_drsuapi_DsAddEntry(struc
1108
1109         r->out.result = _drsuapi_DsAddEntry(p, r);
1110
1111 -       if (p->rng_fault_state) {
1112 +       if (p->fault_state) {
1113                 talloc_free(r);
1114                 /* Return true here, srv_pipe_hnd.c will take care */
1115                 return true;
1116 @@ -1472,7 +1472,7 @@ static bool api_drsuapi_DsExecuteKCC(str
1117
1118         r->out.result = _drsuapi_DsExecuteKCC(p, r);
1119
1120 -       if (p->rng_fault_state) {
1121 +       if (p->fault_state) {
1122                 talloc_free(r);
1123                 /* Return true here, srv_pipe_hnd.c will take care */
1124                 return true;
1125 @@ -1558,7 +1558,7 @@ static bool api_drsuapi_DsReplicaGetInfo
1126
1127         r->out.result = _drsuapi_DsReplicaGetInfo(p, r);
1128
1129 -       if (p->rng_fault_state) {
1130 +       if (p->fault_state) {
1131                 talloc_free(r);
1132                 /* Return true here, srv_pipe_hnd.c will take care */
1133                 return true;
1134 @@ -1631,7 +1631,7 @@ static bool api_DRSUAPI_ADD_SID_HISTORY(
1135
1136         r->out.result = _DRSUAPI_ADD_SID_HISTORY(p, r);
1137
1138 -       if (p->rng_fault_state) {
1139 +       if (p->fault_state) {
1140                 talloc_free(r);
1141                 /* Return true here, srv_pipe_hnd.c will take care */
1142                 return true;
1143 @@ -1717,7 +1717,7 @@ static bool api_drsuapi_DsGetMemberships
1144
1145         r->out.result = _drsuapi_DsGetMemberships2(p, r);
1146
1147 -       if (p->rng_fault_state) {
1148 +       if (p->fault_state) {
1149                 talloc_free(r);
1150                 /* Return true here, srv_pipe_hnd.c will take care */
1151                 return true;
1152 @@ -1790,7 +1790,7 @@ static bool api_DRSUAPI_REPLICA_VERIFY_O
1153
1154         r->out.result = _DRSUAPI_REPLICA_VERIFY_OBJECTS(p, r);
1155
1156 -       if (p->rng_fault_state) {
1157 +       if (p->fault_state) {
1158                 talloc_free(r);
1159                 /* Return true here, srv_pipe_hnd.c will take care */
1160                 return true;
1161 @@ -1863,7 +1863,7 @@ static bool api_DRSUAPI_GET_OBJECT_EXIST
1162
1163         r->out.result = _DRSUAPI_GET_OBJECT_EXISTENCE(p, r);
1164
1165 -       if (p->rng_fault_state) {
1166 +       if (p->fault_state) {
1167                 talloc_free(r);
1168                 /* Return true here, srv_pipe_hnd.c will take care */
1169                 return true;
1170 @@ -1949,7 +1949,7 @@ static bool api_drsuapi_QuerySitesByCost
1171
1172         r->out.result = _drsuapi_QuerySitesByCost(p, r);
1173
1174 -       if (p->rng_fault_state) {
1175 +       if (p->fault_state) {
1176                 talloc_free(r);
1177                 /* Return true here, srv_pipe_hnd.c will take care */
1178                 return true;
1179 --- a/source3/librpc/gen_ndr/srv_dsbackup.c
1180 +++ b/source3/librpc/gen_ndr/srv_dsbackup.c
1181 @@ -44,7 +44,7 @@ static bool api_HrRBackupPrepare(struct
1182
1183         _HrRBackupPrepare(p, r);
1184
1185 -       if (p->rng_fault_state) {
1186 +       if (p->fault_state) {
1187                 talloc_free(r);
1188                 /* Return true here, srv_pipe_hnd.c will take care */
1189                 return true;
1190 @@ -117,7 +117,7 @@ static bool api_HrRBackupEnd(struct pipe
1191
1192         _HrRBackupEnd(p, r);
1193
1194 -       if (p->rng_fault_state) {
1195 +       if (p->fault_state) {
1196                 talloc_free(r);
1197                 /* Return true here, srv_pipe_hnd.c will take care */
1198                 return true;
1199 @@ -190,7 +190,7 @@ static bool api_HrRBackupGetAttachmentIn
1200
1201         _HrRBackupGetAttachmentInformation(p, r);
1202
1203 -       if (p->rng_fault_state) {
1204 +       if (p->fault_state) {
1205                 talloc_free(r);
1206                 /* Return true here, srv_pipe_hnd.c will take care */
1207                 return true;
1208 @@ -263,7 +263,7 @@ static bool api_HrRBackupOpenFile(struct
1209
1210         _HrRBackupOpenFile(p, r);
1211
1212 -       if (p->rng_fault_state) {
1213 +       if (p->fault_state) {
1214                 talloc_free(r);
1215                 /* Return true here, srv_pipe_hnd.c will take care */
1216                 return true;
1217 @@ -336,7 +336,7 @@ static bool api_HrRBackupRead(struct pip
1218
1219         _HrRBackupRead(p, r);
1220
1221 -       if (p->rng_fault_state) {
1222 +       if (p->fault_state) {
1223                 talloc_free(r);
1224                 /* Return true here, srv_pipe_hnd.c will take care */
1225                 return true;
1226 @@ -409,7 +409,7 @@ static bool api_HrRBackupClose(struct pi
1227
1228         _HrRBackupClose(p, r);
1229
1230 -       if (p->rng_fault_state) {
1231 +       if (p->fault_state) {
1232                 talloc_free(r);
1233                 /* Return true here, srv_pipe_hnd.c will take care */
1234                 return true;
1235 @@ -482,7 +482,7 @@ static bool api_HrRBackupGetBackupLogs(s
1236
1237         _HrRBackupGetBackupLogs(p, r);
1238
1239 -       if (p->rng_fault_state) {
1240 +       if (p->fault_state) {
1241                 talloc_free(r);
1242                 /* Return true here, srv_pipe_hnd.c will take care */
1243                 return true;
1244 @@ -555,7 +555,7 @@ static bool api_HrRBackupTruncateLogs(st
1245
1246         _HrRBackupTruncateLogs(p, r);
1247
1248 -       if (p->rng_fault_state) {
1249 +       if (p->fault_state) {
1250                 talloc_free(r);
1251                 /* Return true here, srv_pipe_hnd.c will take care */
1252                 return true;
1253 @@ -628,7 +628,7 @@ static bool api_HrRBackupPing(struct pip
1254
1255         _HrRBackupPing(p, r);
1256
1257 -       if (p->rng_fault_state) {
1258 +       if (p->fault_state) {
1259                 talloc_free(r);
1260                 /* Return true here, srv_pipe_hnd.c will take care */
1261                 return true;
1262 @@ -731,7 +731,7 @@ static bool api_HrRIsNTDSOnline(struct p
1263
1264         _HrRIsNTDSOnline(p, r);
1265
1266 -       if (p->rng_fault_state) {
1267 +       if (p->fault_state) {
1268                 talloc_free(r);
1269                 /* Return true here, srv_pipe_hnd.c will take care */
1270                 return true;
1271 @@ -804,7 +804,7 @@ static bool api_HrRRestorePrepare(struct
1272
1273         _HrRRestorePrepare(p, r);
1274
1275 -       if (p->rng_fault_state) {
1276 +       if (p->fault_state) {
1277                 talloc_free(r);
1278                 /* Return true here, srv_pipe_hnd.c will take care */
1279                 return true;
1280 @@ -877,7 +877,7 @@ static bool api_HrRRestoreRegister(struc
1281
1282         _HrRRestoreRegister(p, r);
1283
1284 -       if (p->rng_fault_state) {
1285 +       if (p->fault_state) {
1286                 talloc_free(r);
1287                 /* Return true here, srv_pipe_hnd.c will take care */
1288                 return true;
1289 @@ -950,7 +950,7 @@ static bool api_HrRRestoreRegisterComple
1290
1291         _HrRRestoreRegisterComplete(p, r);
1292
1293 -       if (p->rng_fault_state) {
1294 +       if (p->fault_state) {
1295                 talloc_free(r);
1296                 /* Return true here, srv_pipe_hnd.c will take care */
1297                 return true;
1298 @@ -1023,7 +1023,7 @@ static bool api_HrRRestoreGetDatabaseLoc
1299
1300         _HrRRestoreGetDatabaseLocations(p, r);
1301
1302 -       if (p->rng_fault_state) {
1303 +       if (p->fault_state) {
1304                 talloc_free(r);
1305                 /* Return true here, srv_pipe_hnd.c will take care */
1306                 return true;
1307 @@ -1096,7 +1096,7 @@ static bool api_HrRRestoreEnd(struct pip
1308
1309         _HrRRestoreEnd(p, r);
1310
1311 -       if (p->rng_fault_state) {
1312 +       if (p->fault_state) {
1313                 talloc_free(r);
1314                 /* Return true here, srv_pipe_hnd.c will take care */
1315                 return true;
1316 @@ -1169,7 +1169,7 @@ static bool api_HrRRestoreSetCurrentLogN
1317
1318         _HrRRestoreSetCurrentLogNumber(p, r);
1319
1320 -       if (p->rng_fault_state) {
1321 +       if (p->fault_state) {
1322                 talloc_free(r);
1323                 /* Return true here, srv_pipe_hnd.c will take care */
1324                 return true;
1325 @@ -1242,7 +1242,7 @@ static bool api_HrRRestoreCheckLogsForBa
1326
1327         _HrRRestoreCheckLogsForBackup(p, r);
1328
1329 -       if (p->rng_fault_state) {
1330 +       if (p->fault_state) {
1331                 talloc_free(r);
1332                 /* Return true here, srv_pipe_hnd.c will take care */
1333                 return true;
1334 --- a/source3/librpc/gen_ndr/srv_dssetup.c
1335 +++ b/source3/librpc/gen_ndr/srv_dssetup.c
1336 @@ -51,7 +51,7 @@ static bool api_dssetup_DsRoleGetPrimary
1337
1338         r->out.result = _dssetup_DsRoleGetPrimaryDomainInformation(p, r);
1339
1340 -       if (p->rng_fault_state) {
1341 +       if (p->fault_state) {
1342                 talloc_free(r);
1343                 /* Return true here, srv_pipe_hnd.c will take care */
1344                 return true;
1345 @@ -124,7 +124,7 @@ static bool api_dssetup_DsRoleDnsNameToF
1346
1347         r->out.result = _dssetup_DsRoleDnsNameToFlatName(p, r);
1348
1349 -       if (p->rng_fault_state) {
1350 +       if (p->fault_state) {
1351                 talloc_free(r);
1352                 /* Return true here, srv_pipe_hnd.c will take care */
1353                 return true;
1354 @@ -197,7 +197,7 @@ static bool api_dssetup_DsRoleDcAsDc(str
1355
1356         r->out.result = _dssetup_DsRoleDcAsDc(p, r);
1357
1358 -       if (p->rng_fault_state) {
1359 +       if (p->fault_state) {
1360                 talloc_free(r);
1361                 /* Return true here, srv_pipe_hnd.c will take care */
1362                 return true;
1363 @@ -270,7 +270,7 @@ static bool api_dssetup_DsRoleDcAsReplic
1364
1365         r->out.result = _dssetup_DsRoleDcAsReplica(p, r);
1366
1367 -       if (p->rng_fault_state) {
1368 +       if (p->fault_state) {
1369                 talloc_free(r);
1370                 /* Return true here, srv_pipe_hnd.c will take care */
1371                 return true;
1372 @@ -343,7 +343,7 @@ static bool api_dssetup_DsRoleDemoteDc(s
1373
1374         r->out.result = _dssetup_DsRoleDemoteDc(p, r);
1375
1376 -       if (p->rng_fault_state) {
1377 +       if (p->fault_state) {
1378                 talloc_free(r);
1379                 /* Return true here, srv_pipe_hnd.c will take care */
1380                 return true;
1381 @@ -416,7 +416,7 @@ static bool api_dssetup_DsRoleGetDcOpera
1382
1383         r->out.result = _dssetup_DsRoleGetDcOperationProgress(p, r);
1384
1385 -       if (p->rng_fault_state) {
1386 +       if (p->fault_state) {
1387                 talloc_free(r);
1388                 /* Return true here, srv_pipe_hnd.c will take care */
1389                 return true;
1390 @@ -489,7 +489,7 @@ static bool api_dssetup_DsRoleGetDcOpera
1391
1392         r->out.result = _dssetup_DsRoleGetDcOperationResults(p, r);
1393
1394 -       if (p->rng_fault_state) {
1395 +       if (p->fault_state) {
1396                 talloc_free(r);
1397                 /* Return true here, srv_pipe_hnd.c will take care */
1398                 return true;
1399 @@ -562,7 +562,7 @@ static bool api_dssetup_DsRoleCancel(str
1400
1401         r->out.result = _dssetup_DsRoleCancel(p, r);
1402
1403 -       if (p->rng_fault_state) {
1404 +       if (p->fault_state) {
1405                 talloc_free(r);
1406                 /* Return true here, srv_pipe_hnd.c will take care */
1407                 return true;
1408 @@ -635,7 +635,7 @@ static bool api_dssetup_DsRoleServerSave
1409
1410         r->out.result = _dssetup_DsRoleServerSaveStateForUpgrade(p, r);
1411
1412 -       if (p->rng_fault_state) {
1413 +       if (p->fault_state) {
1414                 talloc_free(r);
1415                 /* Return true here, srv_pipe_hnd.c will take care */
1416                 return true;
1417 @@ -708,7 +708,7 @@ static bool api_dssetup_DsRoleUpgradeDow
1418
1419         r->out.result = _dssetup_DsRoleUpgradeDownlevelServer(p, r);
1420
1421 -       if (p->rng_fault_state) {
1422 +       if (p->fault_state) {
1423                 talloc_free(r);
1424                 /* Return true here, srv_pipe_hnd.c will take care */
1425                 return true;
1426 @@ -781,7 +781,7 @@ static bool api_dssetup_DsRoleAbortDownl
1427
1428         r->out.result = _dssetup_DsRoleAbortDownlevelServerUpgrade(p, r);
1429
1430 -       if (p->rng_fault_state) {
1431 +       if (p->fault_state) {
1432                 talloc_free(r);
1433                 /* Return true here, srv_pipe_hnd.c will take care */
1434                 return true;
1435 --- a/source3/librpc/gen_ndr/srv_echo.c
1436 +++ b/source3/librpc/gen_ndr/srv_echo.c
1437 @@ -51,7 +51,7 @@ static bool api_echo_AddOne(struct pipes
1438
1439         _echo_AddOne(p, r);
1440
1441 -       if (p->rng_fault_state) {
1442 +       if (p->fault_state) {
1443                 talloc_free(r);
1444                 /* Return true here, srv_pipe_hnd.c will take care */
1445                 return true;
1446 @@ -131,7 +131,7 @@ static bool api_echo_EchoData(struct pip
1447
1448         _echo_EchoData(p, r);
1449
1450 -       if (p->rng_fault_state) {
1451 +       if (p->fault_state) {
1452                 talloc_free(r);
1453                 /* Return true here, srv_pipe_hnd.c will take care */
1454                 return true;
1455 @@ -204,7 +204,7 @@ static bool api_echo_SinkData(struct pip
1456
1457         _echo_SinkData(p, r);
1458
1459 -       if (p->rng_fault_state) {
1460 +       if (p->fault_state) {
1461                 talloc_free(r);
1462                 /* Return true here, srv_pipe_hnd.c will take care */
1463                 return true;
1464 @@ -284,7 +284,7 @@ static bool api_echo_SourceData(struct p
1465
1466         _echo_SourceData(p, r);
1467
1468 -       if (p->rng_fault_state) {
1469 +       if (p->fault_state) {
1470                 talloc_free(r);
1471                 /* Return true here, srv_pipe_hnd.c will take care */
1472                 return true;
1473 @@ -364,7 +364,7 @@ static bool api_echo_TestCall(struct pip
1474
1475         _echo_TestCall(p, r);
1476
1477 -       if (p->rng_fault_state) {
1478 +       if (p->fault_state) {
1479                 talloc_free(r);
1480                 /* Return true here, srv_pipe_hnd.c will take care */
1481                 return true;
1482 @@ -444,7 +444,7 @@ static bool api_echo_TestCall2(struct pi
1483
1484         r->out.result = _echo_TestCall2(p, r);
1485
1486 -       if (p->rng_fault_state) {
1487 +       if (p->fault_state) {
1488                 talloc_free(r);
1489                 /* Return true here, srv_pipe_hnd.c will take care */
1490                 return true;
1491 @@ -517,7 +517,7 @@ static bool api_echo_TestSleep(struct pi
1492
1493         r->out.result = _echo_TestSleep(p, r);
1494
1495 -       if (p->rng_fault_state) {
1496 +       if (p->fault_state) {
1497                 talloc_free(r);
1498                 /* Return true here, srv_pipe_hnd.c will take care */
1499                 return true;
1500 @@ -594,7 +594,7 @@ static bool api_echo_TestEnum(struct pip
1501         r->out.foo3 = r->in.foo3;
1502         _echo_TestEnum(p, r);
1503
1504 -       if (p->rng_fault_state) {
1505 +       if (p->fault_state) {
1506                 talloc_free(r);
1507                 /* Return true here, srv_pipe_hnd.c will take care */
1508                 return true;
1509 @@ -669,7 +669,7 @@ static bool api_echo_TestSurrounding(str
1510         r->out.data = r->in.data;
1511         _echo_TestSurrounding(p, r);
1512
1513 -       if (p->rng_fault_state) {
1514 +       if (p->fault_state) {
1515                 talloc_free(r);
1516                 /* Return true here, srv_pipe_hnd.c will take care */
1517                 return true;
1518 @@ -742,7 +742,7 @@ static bool api_echo_TestDoublePointer(s
1519
1520         r->out.result = _echo_TestDoublePointer(p, r);
1521
1522 -       if (p->rng_fault_state) {
1523 +       if (p->fault_state) {
1524                 talloc_free(r);
1525                 /* Return true here, srv_pipe_hnd.c will take care */
1526                 return true;
1527 --- a/source3/librpc/gen_ndr/srv_efs.c
1528 +++ b/source3/librpc/gen_ndr/srv_efs.c
1529 @@ -51,7 +51,7 @@ static bool api_EfsRpcOpenFileRaw(struct
1530
1531         r->out.result = _EfsRpcOpenFileRaw(p, r);
1532
1533 -       if (p->rng_fault_state) {
1534 +       if (p->fault_state) {
1535                 talloc_free(r);
1536                 /* Return true here, srv_pipe_hnd.c will take care */
1537                 return true;
1538 @@ -124,7 +124,7 @@ static bool api_EfsRpcReadFileRaw(struct
1539
1540         r->out.result = _EfsRpcReadFileRaw(p, r);
1541
1542 -       if (p->rng_fault_state) {
1543 +       if (p->fault_state) {
1544                 talloc_free(r);
1545                 /* Return true here, srv_pipe_hnd.c will take care */
1546                 return true;
1547 @@ -197,7 +197,7 @@ static bool api_EfsRpcWriteFileRaw(struc
1548
1549         r->out.result = _EfsRpcWriteFileRaw(p, r);
1550
1551 -       if (p->rng_fault_state) {
1552 +       if (p->fault_state) {
1553                 talloc_free(r);
1554                 /* Return true here, srv_pipe_hnd.c will take care */
1555                 return true;
1556 @@ -272,7 +272,7 @@ static bool api_EfsRpcCloseRaw(struct pi
1557         r->out.pvContext = r->in.pvContext;
1558         _EfsRpcCloseRaw(p, r);
1559
1560 -       if (p->rng_fault_state) {
1561 +       if (p->fault_state) {
1562                 talloc_free(r);
1563                 /* Return true here, srv_pipe_hnd.c will take care */
1564                 return true;
1565 @@ -345,7 +345,7 @@ static bool api_EfsRpcEncryptFileSrv(str
1566
1567         r->out.result = _EfsRpcEncryptFileSrv(p, r);
1568
1569 -       if (p->rng_fault_state) {
1570 +       if (p->fault_state) {
1571                 talloc_free(r);
1572                 /* Return true here, srv_pipe_hnd.c will take care */
1573                 return true;
1574 @@ -418,7 +418,7 @@ static bool api_EfsRpcDecryptFileSrv(str
1575
1576         r->out.result = _EfsRpcDecryptFileSrv(p, r);
1577
1578 -       if (p->rng_fault_state) {
1579 +       if (p->fault_state) {
1580                 talloc_free(r);
1581                 /* Return true here, srv_pipe_hnd.c will take care */
1582                 return true;
1583 @@ -498,7 +498,7 @@ static bool api_EfsRpcQueryUsersOnFile(s
1584
1585         r->out.result = _EfsRpcQueryUsersOnFile(p, r);
1586
1587 -       if (p->rng_fault_state) {
1588 +       if (p->fault_state) {
1589                 talloc_free(r);
1590                 /* Return true here, srv_pipe_hnd.c will take care */
1591                 return true;
1592 @@ -578,7 +578,7 @@ static bool api_EfsRpcQueryRecoveryAgent
1593
1594         r->out.result = _EfsRpcQueryRecoveryAgents(p, r);
1595
1596 -       if (p->rng_fault_state) {
1597 +       if (p->fault_state) {
1598                 talloc_free(r);
1599                 /* Return true here, srv_pipe_hnd.c will take care */
1600                 return true;
1601 @@ -651,7 +651,7 @@ static bool api_EfsRpcRemoveUsersFromFil
1602
1603         r->out.result = _EfsRpcRemoveUsersFromFile(p, r);
1604
1605 -       if (p->rng_fault_state) {
1606 +       if (p->fault_state) {
1607                 talloc_free(r);
1608                 /* Return true here, srv_pipe_hnd.c will take care */
1609                 return true;
1610 @@ -724,7 +724,7 @@ static bool api_EfsRpcAddUsersToFile(str
1611
1612         r->out.result = _EfsRpcAddUsersToFile(p, r);
1613
1614 -       if (p->rng_fault_state) {
1615 +       if (p->fault_state) {
1616                 talloc_free(r);
1617                 /* Return true here, srv_pipe_hnd.c will take care */
1618                 return true;
1619 @@ -797,7 +797,7 @@ static bool api_EfsRpcSetFileEncryptionK
1620
1621         r->out.result = _EfsRpcSetFileEncryptionKey(p, r);
1622
1623 -       if (p->rng_fault_state) {
1624 +       if (p->fault_state) {
1625                 talloc_free(r);
1626                 /* Return true here, srv_pipe_hnd.c will take care */
1627                 return true;
1628 @@ -870,7 +870,7 @@ static bool api_EfsRpcNotSupported(struc
1629
1630         r->out.result = _EfsRpcNotSupported(p, r);
1631
1632 -       if (p->rng_fault_state) {
1633 +       if (p->fault_state) {
1634                 talloc_free(r);
1635                 /* Return true here, srv_pipe_hnd.c will take care */
1636                 return true;
1637 @@ -943,7 +943,7 @@ static bool api_EfsRpcFileKeyInfo(struct
1638
1639         r->out.result = _EfsRpcFileKeyInfo(p, r);
1640
1641 -       if (p->rng_fault_state) {
1642 +       if (p->fault_state) {
1643                 talloc_free(r);
1644                 /* Return true here, srv_pipe_hnd.c will take care */
1645                 return true;
1646 @@ -1016,7 +1016,7 @@ static bool api_EfsRpcDuplicateEncryptio
1647
1648         r->out.result = _EfsRpcDuplicateEncryptionInfoFile(p, r);
1649
1650 -       if (p->rng_fault_state) {
1651 +       if (p->fault_state) {
1652                 talloc_free(r);
1653                 /* Return true here, srv_pipe_hnd.c will take care */
1654                 return true;
1655 --- a/source3/librpc/gen_ndr/srv_epmapper.c
1656 +++ b/source3/librpc/gen_ndr/srv_epmapper.c
1657 @@ -44,7 +44,7 @@ static bool api_epm_Insert(struct pipes_
1658
1659         r->out.result = _epm_Insert(p, r);
1660
1661 -       if (p->rng_fault_state) {
1662 +       if (p->fault_state) {
1663                 talloc_free(r);
1664                 /* Return true here, srv_pipe_hnd.c will take care */
1665                 return true;
1666 @@ -117,7 +117,7 @@ static bool api_epm_Delete(struct pipes_
1667
1668         r->out.result = _epm_Delete(p, r);
1669
1670 -       if (p->rng_fault_state) {
1671 +       if (p->fault_state) {
1672                 talloc_free(r);
1673                 /* Return true here, srv_pipe_hnd.c will take care */
1674                 return true;
1675 @@ -204,7 +204,7 @@ static bool api_epm_Lookup(struct pipes_
1676
1677         r->out.result = _epm_Lookup(p, r);
1678
1679 -       if (p->rng_fault_state) {
1680 +       if (p->fault_state) {
1681                 talloc_free(r);
1682                 /* Return true here, srv_pipe_hnd.c will take care */
1683                 return true;
1684 @@ -291,7 +291,7 @@ static bool api_epm_Map(struct pipes_str
1685
1686         r->out.result = _epm_Map(p, r);
1687
1688 -       if (p->rng_fault_state) {
1689 +       if (p->fault_state) {
1690                 talloc_free(r);
1691                 /* Return true here, srv_pipe_hnd.c will take care */
1692                 return true;
1693 @@ -366,7 +366,7 @@ static bool api_epm_LookupHandleFree(str
1694         r->out.entry_handle = r->in.entry_handle;
1695         r->out.result = _epm_LookupHandleFree(p, r);
1696
1697 -       if (p->rng_fault_state) {
1698 +       if (p->fault_state) {
1699                 talloc_free(r);
1700                 /* Return true here, srv_pipe_hnd.c will take care */
1701                 return true;
1702 @@ -439,7 +439,7 @@ static bool api_epm_InqObject(struct pip
1703
1704         r->out.result = _epm_InqObject(p, r);
1705
1706 -       if (p->rng_fault_state) {
1707 +       if (p->fault_state) {
1708                 talloc_free(r);
1709                 /* Return true here, srv_pipe_hnd.c will take care */
1710                 return true;
1711 @@ -512,7 +512,7 @@ static bool api_epm_MgmtDelete(struct pi
1712
1713         r->out.result = _epm_MgmtDelete(p, r);
1714
1715 -       if (p->rng_fault_state) {
1716 +       if (p->fault_state) {
1717                 talloc_free(r);
1718                 /* Return true here, srv_pipe_hnd.c will take care */
1719                 return true;
1720 @@ -585,7 +585,7 @@ static bool api_epm_MapAuth(struct pipes
1721
1722         r->out.result = _epm_MapAuth(p, r);
1723
1724 -       if (p->rng_fault_state) {
1725 +       if (p->fault_state) {
1726                 talloc_free(r);
1727                 /* Return true here, srv_pipe_hnd.c will take care */
1728                 return true;
1729 --- a/source3/librpc/gen_ndr/srv_eventlog6.c
1730 +++ b/source3/librpc/gen_ndr/srv_eventlog6.c
1731 @@ -75,7 +75,7 @@ static bool api_eventlog6_EvtRpcRegister
1732
1733         r->out.result = _eventlog6_EvtRpcRegisterRemoteSubscription(p, r);
1734
1735 -       if (p->rng_fault_state) {
1736 +       if (p->fault_state) {
1737                 talloc_free(r);
1738                 /* Return true here, srv_pipe_hnd.c will take care */
1739                 return true;
1740 @@ -179,7 +179,7 @@ static bool api_eventlog6_EvtRpcRemoteSu
1741
1742         r->out.result = _eventlog6_EvtRpcRemoteSubscriptionNextAsync(p, r);
1743
1744 -       if (p->rng_fault_state) {
1745 +       if (p->fault_state) {
1746                 talloc_free(r);
1747                 /* Return true here, srv_pipe_hnd.c will take care */
1748                 return true;
1749 @@ -283,7 +283,7 @@ static bool api_eventlog6_EvtRpcRemoteSu
1750
1751         r->out.result = _eventlog6_EvtRpcRemoteSubscriptionNext(p, r);
1752
1753 -       if (p->rng_fault_state) {
1754 +       if (p->fault_state) {
1755                 talloc_free(r);
1756                 /* Return true here, srv_pipe_hnd.c will take care */
1757                 return true;
1758 @@ -356,7 +356,7 @@ static bool api_eventlog6_EvtRpcRemoteSu
1759
1760         r->out.result = _eventlog6_EvtRpcRemoteSubscriptionWaitAsync(p, r);
1761
1762 -       if (p->rng_fault_state) {
1763 +       if (p->fault_state) {
1764                 talloc_free(r);
1765                 /* Return true here, srv_pipe_hnd.c will take care */
1766                 return true;
1767 @@ -436,7 +436,7 @@ static bool api_eventlog6_EvtRpcRegister
1768
1769         r->out.result = _eventlog6_EvtRpcRegisterControllableOperation(p, r);
1770
1771 -       if (p->rng_fault_state) {
1772 +       if (p->fault_state) {
1773                 talloc_free(r);
1774                 /* Return true here, srv_pipe_hnd.c will take care */
1775                 return true;
1776 @@ -540,7 +540,7 @@ static bool api_eventlog6_EvtRpcRegister
1777
1778         r->out.result = _eventlog6_EvtRpcRegisterLogQuery(p, r);
1779
1780 -       if (p->rng_fault_state) {
1781 +       if (p->fault_state) {
1782                 talloc_free(r);
1783                 /* Return true here, srv_pipe_hnd.c will take care */
1784                 return true;
1785 @@ -620,7 +620,7 @@ static bool api_eventlog6_EvtRpcClearLog
1786
1787         r->out.result = _eventlog6_EvtRpcClearLog(p, r);
1788
1789 -       if (p->rng_fault_state) {
1790 +       if (p->fault_state) {
1791                 talloc_free(r);
1792                 /* Return true here, srv_pipe_hnd.c will take care */
1793                 return true;
1794 @@ -700,7 +700,7 @@ static bool api_eventlog6_EvtRpcExportLo
1795
1796         r->out.result = _eventlog6_EvtRpcExportLog(p, r);
1797
1798 -       if (p->rng_fault_state) {
1799 +       if (p->fault_state) {
1800                 talloc_free(r);
1801                 /* Return true here, srv_pipe_hnd.c will take care */
1802                 return true;
1803 @@ -780,7 +780,7 @@ static bool api_eventlog6_EvtRpcLocalize
1804
1805         r->out.result = _eventlog6_EvtRpcLocalizeExportLog(p, r);
1806
1807 -       if (p->rng_fault_state) {
1808 +       if (p->fault_state) {
1809                 talloc_free(r);
1810                 /* Return true here, srv_pipe_hnd.c will take care */
1811                 return true;
1812 @@ -878,7 +878,7 @@ static bool api_eventlog6_EvtRpcMessageR
1813
1814         r->out.result = _eventlog6_EvtRpcMessageRender(p, r);
1815
1816 -       if (p->rng_fault_state) {
1817 +       if (p->fault_state) {
1818                 talloc_free(r);
1819                 /* Return true here, srv_pipe_hnd.c will take care */
1820                 return true;
1821 @@ -976,7 +976,7 @@ static bool api_eventlog6_EvtRpcMessageR
1822
1823         r->out.result = _eventlog6_EvtRpcMessageRenderDefault(p, r);
1824
1825 -       if (p->rng_fault_state) {
1826 +       if (p->fault_state) {
1827                 talloc_free(r);
1828                 /* Return true here, srv_pipe_hnd.c will take care */
1829                 return true;
1830 @@ -1080,7 +1080,7 @@ static bool api_eventlog6_EvtRpcQueryNex
1831
1832         r->out.result = _eventlog6_EvtRpcQueryNext(p, r);
1833
1834 -       if (p->rng_fault_state) {
1835 +       if (p->fault_state) {
1836                 talloc_free(r);
1837                 /* Return true here, srv_pipe_hnd.c will take care */
1838                 return true;
1839 @@ -1160,7 +1160,7 @@ static bool api_eventlog6_EvtRpcQuerySee
1840
1841         r->out.result = _eventlog6_EvtRpcQuerySeek(p, r);
1842
1843 -       if (p->rng_fault_state) {
1844 +       if (p->fault_state) {
1845                 talloc_free(r);
1846                 /* Return true here, srv_pipe_hnd.c will take care */
1847                 return true;
1848 @@ -1235,7 +1235,7 @@ static bool api_eventlog6_EvtRpcClose(st
1849         r->out.handle = r->in.handle;
1850         r->out.result = _eventlog6_EvtRpcClose(p, r);
1851
1852 -       if (p->rng_fault_state) {
1853 +       if (p->fault_state) {
1854                 talloc_free(r);
1855                 /* Return true here, srv_pipe_hnd.c will take care */
1856                 return true;
1857 @@ -1308,7 +1308,7 @@ static bool api_eventlog6_EvtRpcCancel(s
1858
1859         r->out.result = _eventlog6_EvtRpcCancel(p, r);
1860
1861 -       if (p->rng_fault_state) {
1862 +       if (p->fault_state) {
1863                 talloc_free(r);
1864                 /* Return true here, srv_pipe_hnd.c will take care */
1865                 return true;
1866 @@ -1381,7 +1381,7 @@ static bool api_eventlog6_EvtRpcAssertCo
1867
1868         r->out.result = _eventlog6_EvtRpcAssertConfig(p, r);
1869
1870 -       if (p->rng_fault_state) {
1871 +       if (p->fault_state) {
1872                 talloc_free(r);
1873                 /* Return true here, srv_pipe_hnd.c will take care */
1874                 return true;
1875 @@ -1454,7 +1454,7 @@ static bool api_eventlog6_EvtRpcRetractC
1876
1877         r->out.result = _eventlog6_EvtRpcRetractConfig(p, r);
1878
1879 -       if (p->rng_fault_state) {
1880 +       if (p->fault_state) {
1881                 talloc_free(r);
1882                 /* Return true here, srv_pipe_hnd.c will take care */
1883                 return true;
1884 @@ -1540,7 +1540,7 @@ static bool api_eventlog6_EvtRpcOpenLogH
1885
1886         r->out.result = _eventlog6_EvtRpcOpenLogHandle(p, r);
1887
1888 -       if (p->rng_fault_state) {
1889 +       if (p->fault_state) {
1890                 talloc_free(r);
1891                 /* Return true here, srv_pipe_hnd.c will take care */
1892                 return true;
1893 @@ -1626,7 +1626,7 @@ static bool api_eventlog6_EvtRpcGetLogFi
1894
1895         r->out.result = _eventlog6_EvtRpcGetLogFileInfo(p, r);
1896
1897 -       if (p->rng_fault_state) {
1898 +       if (p->fault_state) {
1899                 talloc_free(r);
1900                 /* Return true here, srv_pipe_hnd.c will take care */
1901                 return true;
1902 @@ -1712,7 +1712,7 @@ static bool api_eventlog6_EvtRpcGetChann
1903
1904         r->out.result = _eventlog6_EvtRpcGetChannelList(p, r);
1905
1906 -       if (p->rng_fault_state) {
1907 +       if (p->fault_state) {
1908                 talloc_free(r);
1909                 /* Return true here, srv_pipe_hnd.c will take care */
1910                 return true;
1911 @@ -1792,7 +1792,7 @@ static bool api_eventlog6_EvtRpcGetChann
1912
1913         r->out.result = _eventlog6_EvtRpcGetChannelConfig(p, r);
1914
1915 -       if (p->rng_fault_state) {
1916 +       if (p->fault_state) {
1917                 talloc_free(r);
1918                 /* Return true here, srv_pipe_hnd.c will take care */
1919                 return true;
1920 @@ -1872,7 +1872,7 @@ static bool api_eventlog6_EvtRpcPutChann
1921
1922         r->out.result = _eventlog6_EvtRpcPutChannelConfig(p, r);
1923
1924 -       if (p->rng_fault_state) {
1925 +       if (p->fault_state) {
1926                 talloc_free(r);
1927                 /* Return true here, srv_pipe_hnd.c will take care */
1928                 return true;
1929 @@ -1958,7 +1958,7 @@ static bool api_eventlog6_EvtRpcGetPubli
1930
1931         r->out.result = _eventlog6_EvtRpcGetPublisherList(p, r);
1932
1933 -       if (p->rng_fault_state) {
1934 +       if (p->fault_state) {
1935                 talloc_free(r);
1936                 /* Return true here, srv_pipe_hnd.c will take care */
1937                 return true;
1938 @@ -2044,7 +2044,7 @@ static bool api_eventlog6_EvtRpcGetPubli
1939
1940         r->out.result = _eventlog6_EvtRpcGetPublisherListForChannel(p, r);
1941
1942 -       if (p->rng_fault_state) {
1943 +       if (p->fault_state) {
1944                 talloc_free(r);
1945                 /* Return true here, srv_pipe_hnd.c will take care */
1946                 return true;
1947 @@ -2130,7 +2130,7 @@ static bool api_eventlog6_EvtRpcGetPubli
1948
1949         r->out.result = _eventlog6_EvtRpcGetPublisherMetadata(p, r);
1950
1951 -       if (p->rng_fault_state) {
1952 +       if (p->fault_state) {
1953                 talloc_free(r);
1954                 /* Return true here, srv_pipe_hnd.c will take care */
1955                 return true;
1956 @@ -2210,7 +2210,7 @@ static bool api_eventlog6_EvtRpcGetPubli
1957
1958         r->out.result = _eventlog6_EvtRpcGetPublisherResourceMetadata(p, r);
1959
1960 -       if (p->rng_fault_state) {
1961 +       if (p->fault_state) {
1962                 talloc_free(r);
1963                 /* Return true here, srv_pipe_hnd.c will take care */
1964                 return true;
1965 @@ -2290,7 +2290,7 @@ static bool api_eventlog6_EvtRpcGetEvent
1966
1967         r->out.result = _eventlog6_EvtRpcGetEventMetadataEnum(p, r);
1968
1969 -       if (p->rng_fault_state) {
1970 +       if (p->fault_state) {
1971                 talloc_free(r);
1972                 /* Return true here, srv_pipe_hnd.c will take care */
1973                 return true;
1974 @@ -2376,7 +2376,7 @@ static bool api_eventlog6_EvtRpcGetNextE
1975
1976         r->out.result = _eventlog6_EvtRpcGetNextEventMetadata(p, r);
1977
1978 -       if (p->rng_fault_state) {
1979 +       if (p->fault_state) {
1980                 talloc_free(r);
1981                 /* Return true here, srv_pipe_hnd.c will take care */
1982                 return true;
1983 @@ -2456,7 +2456,7 @@ static bool api_eventlog6_EvtRpcGetClass
1984
1985         r->out.result = _eventlog6_EvtRpcGetClassicLogDisplayName(p, r);
1986
1987 -       if (p->rng_fault_state) {
1988 +       if (p->fault_state) {
1989                 talloc_free(r);
1990                 /* Return true here, srv_pipe_hnd.c will take care */
1991                 return true;
1992 --- a/source3/librpc/gen_ndr/srv_eventlog.c
1993 +++ b/source3/librpc/gen_ndr/srv_eventlog.c
1994 @@ -44,7 +44,7 @@ static bool api_eventlog_ClearEventLogW(
1995
1996         r->out.result = _eventlog_ClearEventLogW(p, r);
1997
1998 -       if (p->rng_fault_state) {
1999 +       if (p->fault_state) {
2000                 talloc_free(r);
2001                 /* Return true here, srv_pipe_hnd.c will take care */
2002                 return true;
2003 @@ -117,7 +117,7 @@ static bool api_eventlog_BackupEventLogW
2004
2005         r->out.result = _eventlog_BackupEventLogW(p, r);
2006
2007 -       if (p->rng_fault_state) {
2008 +       if (p->fault_state) {
2009                 talloc_free(r);
2010                 /* Return true here, srv_pipe_hnd.c will take care */
2011                 return true;
2012 @@ -192,7 +192,7 @@ static bool api_eventlog_CloseEventLog(s
2013         r->out.handle = r->in.handle;
2014         r->out.result = _eventlog_CloseEventLog(p, r);
2015
2016 -       if (p->rng_fault_state) {
2017 +       if (p->fault_state) {
2018                 talloc_free(r);
2019                 /* Return true here, srv_pipe_hnd.c will take care */
2020                 return true;
2021 @@ -267,7 +267,7 @@ static bool api_eventlog_DeregisterEvent
2022         r->out.handle = r->in.handle;
2023         r->out.result = _eventlog_DeregisterEventSource(p, r);
2024
2025 -       if (p->rng_fault_state) {
2026 +       if (p->fault_state) {
2027                 talloc_free(r);
2028                 /* Return true here, srv_pipe_hnd.c will take care */
2029                 return true;
2030 @@ -347,7 +347,7 @@ static bool api_eventlog_GetNumRecords(s
2031
2032         r->out.result = _eventlog_GetNumRecords(p, r);
2033
2034 -       if (p->rng_fault_state) {
2035 +       if (p->fault_state) {
2036                 talloc_free(r);
2037                 /* Return true here, srv_pipe_hnd.c will take care */
2038                 return true;
2039 @@ -427,7 +427,7 @@ static bool api_eventlog_GetOldestRecord
2040
2041         r->out.result = _eventlog_GetOldestRecord(p, r);
2042
2043 -       if (p->rng_fault_state) {
2044 +       if (p->fault_state) {
2045                 talloc_free(r);
2046                 /* Return true here, srv_pipe_hnd.c will take care */
2047                 return true;
2048 @@ -500,7 +500,7 @@ static bool api_eventlog_ChangeNotify(st
2049
2050         r->out.result = _eventlog_ChangeNotify(p, r);
2051
2052 -       if (p->rng_fault_state) {
2053 +       if (p->fault_state) {
2054                 talloc_free(r);
2055                 /* Return true here, srv_pipe_hnd.c will take care */
2056                 return true;
2057 @@ -580,7 +580,7 @@ static bool api_eventlog_OpenEventLogW(s
2058
2059         r->out.result = _eventlog_OpenEventLogW(p, r);
2060
2061 -       if (p->rng_fault_state) {
2062 +       if (p->fault_state) {
2063                 talloc_free(r);
2064                 /* Return true here, srv_pipe_hnd.c will take care */
2065                 return true;
2066 @@ -660,7 +660,7 @@ static bool api_eventlog_RegisterEventSo
2067
2068         r->out.result = _eventlog_RegisterEventSourceW(p, r);
2069
2070 -       if (p->rng_fault_state) {
2071 +       if (p->fault_state) {
2072                 talloc_free(r);
2073                 /* Return true here, srv_pipe_hnd.c will take care */
2074                 return true;
2075 @@ -740,7 +740,7 @@ static bool api_eventlog_OpenBackupEvent
2076
2077         r->out.result = _eventlog_OpenBackupEventLogW(p, r);
2078
2079 -       if (p->rng_fault_state) {
2080 +       if (p->fault_state) {
2081                 talloc_free(r);
2082                 /* Return true here, srv_pipe_hnd.c will take care */
2083                 return true;
2084 @@ -832,7 +832,7 @@ static bool api_eventlog_ReadEventLogW(s
2085
2086         r->out.result = _eventlog_ReadEventLogW(p, r);
2087
2088 -       if (p->rng_fault_state) {
2089 +       if (p->fault_state) {
2090                 talloc_free(r);
2091                 /* Return true here, srv_pipe_hnd.c will take care */
2092                 return true;
2093 @@ -908,7 +908,7 @@ static bool api_eventlog_ReportEventW(st
2094         r->out.time_written = r->in.time_written;
2095         r->out.result = _eventlog_ReportEventW(p, r);
2096
2097 -       if (p->rng_fault_state) {
2098 +       if (p->fault_state) {
2099                 talloc_free(r);
2100                 /* Return true here, srv_pipe_hnd.c will take care */
2101                 return true;
2102 @@ -981,7 +981,7 @@ static bool api_eventlog_ClearEventLogA(
2103
2104         r->out.result = _eventlog_ClearEventLogA(p, r);
2105
2106 -       if (p->rng_fault_state) {
2107 +       if (p->fault_state) {
2108                 talloc_free(r);
2109                 /* Return true here, srv_pipe_hnd.c will take care */
2110                 return true;
2111 @@ -1054,7 +1054,7 @@ static bool api_eventlog_BackupEventLogA
2112
2113         r->out.result = _eventlog_BackupEventLogA(p, r);
2114
2115 -       if (p->rng_fault_state) {
2116 +       if (p->fault_state) {
2117                 talloc_free(r);
2118                 /* Return true here, srv_pipe_hnd.c will take care */
2119                 return true;
2120 @@ -1127,7 +1127,7 @@ static bool api_eventlog_OpenEventLogA(s
2121
2122         r->out.result = _eventlog_OpenEventLogA(p, r);
2123
2124 -       if (p->rng_fault_state) {
2125 +       if (p->fault_state) {
2126                 talloc_free(r);
2127                 /* Return true here, srv_pipe_hnd.c will take care */
2128                 return true;
2129 @@ -1200,7 +1200,7 @@ static bool api_eventlog_RegisterEventSo
2130
2131         r->out.result = _eventlog_RegisterEventSourceA(p, r);
2132
2133 -       if (p->rng_fault_state) {
2134 +       if (p->fault_state) {
2135                 talloc_free(r);
2136                 /* Return true here, srv_pipe_hnd.c will take care */
2137                 return true;
2138 @@ -1273,7 +1273,7 @@ static bool api_eventlog_OpenBackupEvent
2139
2140         r->out.result = _eventlog_OpenBackupEventLogA(p, r);
2141
2142 -       if (p->rng_fault_state) {
2143 +       if (p->fault_state) {
2144                 talloc_free(r);
2145                 /* Return true here, srv_pipe_hnd.c will take care */
2146                 return true;
2147 @@ -1346,7 +1346,7 @@ static bool api_eventlog_ReadEventLogA(s
2148
2149         r->out.result = _eventlog_ReadEventLogA(p, r);
2150
2151 -       if (p->rng_fault_state) {
2152 +       if (p->fault_state) {
2153                 talloc_free(r);
2154                 /* Return true here, srv_pipe_hnd.c will take care */
2155                 return true;
2156 @@ -1419,7 +1419,7 @@ static bool api_eventlog_ReportEventA(st
2157
2158         r->out.result = _eventlog_ReportEventA(p, r);
2159
2160 -       if (p->rng_fault_state) {
2161 +       if (p->fault_state) {
2162                 talloc_free(r);
2163                 /* Return true here, srv_pipe_hnd.c will take care */
2164                 return true;
2165 @@ -1492,7 +1492,7 @@ static bool api_eventlog_RegisterCluster
2166
2167         r->out.result = _eventlog_RegisterClusterSvc(p, r);
2168
2169 -       if (p->rng_fault_state) {
2170 +       if (p->fault_state) {
2171                 talloc_free(r);
2172                 /* Return true here, srv_pipe_hnd.c will take care */
2173                 return true;
2174 @@ -1565,7 +1565,7 @@ static bool api_eventlog_DeregisterClust
2175
2176         r->out.result = _eventlog_DeregisterClusterSvc(p, r);
2177
2178 -       if (p->rng_fault_state) {
2179 +       if (p->fault_state) {
2180                 talloc_free(r);
2181                 /* Return true here, srv_pipe_hnd.c will take care */
2182                 return true;
2183 @@ -1638,7 +1638,7 @@ static bool api_eventlog_WriteClusterEve
2184
2185         r->out.result = _eventlog_WriteClusterEvents(p, r);
2186
2187 -       if (p->rng_fault_state) {
2188 +       if (p->fault_state) {
2189                 talloc_free(r);
2190                 /* Return true here, srv_pipe_hnd.c will take care */
2191                 return true;
2192 @@ -1724,7 +1724,7 @@ static bool api_eventlog_GetLogInformati
2193
2194         r->out.result = _eventlog_GetLogInformation(p, r);
2195
2196 -       if (p->rng_fault_state) {
2197 +       if (p->fault_state) {
2198                 talloc_free(r);
2199                 /* Return true here, srv_pipe_hnd.c will take care */
2200                 return true;
2201 @@ -1797,7 +1797,7 @@ static bool api_eventlog_FlushEventLog(s
2202
2203         r->out.result = _eventlog_FlushEventLog(p, r);
2204
2205 -       if (p->rng_fault_state) {
2206 +       if (p->fault_state) {
2207                 talloc_free(r);
2208                 /* Return true here, srv_pipe_hnd.c will take care */
2209                 return true;
2210 @@ -1873,7 +1873,7 @@ static bool api_eventlog_ReportEventAndS
2211         r->out.time_written = r->in.time_written;
2212         r->out.result = _eventlog_ReportEventAndSourceW(p, r);
2213
2214 -       if (p->rng_fault_state) {
2215 +       if (p->fault_state) {
2216                 talloc_free(r);
2217                 /* Return true here, srv_pipe_hnd.c will take care */
2218                 return true;
2219 --- a/source3/librpc/gen_ndr/srv_frsapi.c
2220 +++ b/source3/librpc/gen_ndr/srv_frsapi.c
2221 @@ -44,7 +44,7 @@ static bool api_FRSAPI_VERIFY_PROMOTION(
2222
2223         _FRSAPI_VERIFY_PROMOTION(p, r);
2224
2225 -       if (p->rng_fault_state) {
2226 +       if (p->fault_state) {
2227                 talloc_free(r);
2228                 /* Return true here, srv_pipe_hnd.c will take care */
2229                 return true;
2230 @@ -117,7 +117,7 @@ static bool api_FRSAPI_PROMOTION_STATUS(
2231
2232         _FRSAPI_PROMOTION_STATUS(p, r);
2233
2234 -       if (p->rng_fault_state) {
2235 +       if (p->fault_state) {
2236                 talloc_free(r);
2237                 /* Return true here, srv_pipe_hnd.c will take care */
2238                 return true;
2239 @@ -190,7 +190,7 @@ static bool api_FRSAPI_START_DEMOTION(st
2240
2241         _FRSAPI_START_DEMOTION(p, r);
2242
2243 -       if (p->rng_fault_state) {
2244 +       if (p->fault_state) {
2245                 talloc_free(r);
2246                 /* Return true here, srv_pipe_hnd.c will take care */
2247                 return true;
2248 @@ -263,7 +263,7 @@ static bool api_FRSAPI_COMMIT_DEMOTION(s
2249
2250         _FRSAPI_COMMIT_DEMOTION(p, r);
2251
2252 -       if (p->rng_fault_state) {
2253 +       if (p->fault_state) {
2254                 talloc_free(r);
2255                 /* Return true here, srv_pipe_hnd.c will take care */
2256                 return true;
2257 @@ -336,7 +336,7 @@ static bool api_frsapi_SetDsPollingInter
2258
2259         r->out.result = _frsapi_SetDsPollingIntervalW(p, r);
2260
2261 -       if (p->rng_fault_state) {
2262 +       if (p->fault_state) {
2263                 talloc_free(r);
2264                 /* Return true here, srv_pipe_hnd.c will take care */
2265                 return true;
2266 @@ -428,7 +428,7 @@ static bool api_frsapi_GetDsPollingInter
2267
2268         r->out.result = _frsapi_GetDsPollingIntervalW(p, r);
2269
2270 -       if (p->rng_fault_state) {
2271 +       if (p->fault_state) {
2272                 talloc_free(r);
2273                 /* Return true here, srv_pipe_hnd.c will take care */
2274                 return true;
2275 @@ -501,7 +501,7 @@ static bool api_FRSAPI_VERIFY_PROMOTION_
2276
2277         _FRSAPI_VERIFY_PROMOTION_W(p, r);
2278
2279 -       if (p->rng_fault_state) {
2280 +       if (p->fault_state) {
2281                 talloc_free(r);
2282                 /* Return true here, srv_pipe_hnd.c will take care */
2283                 return true;
2284 @@ -576,7 +576,7 @@ static bool api_frsapi_InfoW(struct pipe
2285         r->out.info = r->in.info;
2286         r->out.result = _frsapi_InfoW(p, r);
2287
2288 -       if (p->rng_fault_state) {
2289 +       if (p->fault_state) {
2290                 talloc_free(r);
2291                 /* Return true here, srv_pipe_hnd.c will take care */
2292                 return true;
2293 @@ -674,7 +674,7 @@ static bool api_frsapi_IsPathReplicated(
2294
2295         r->out.result = _frsapi_IsPathReplicated(p, r);
2296
2297 -       if (p->rng_fault_state) {
2298 +       if (p->fault_state) {
2299                 talloc_free(r);
2300                 /* Return true here, srv_pipe_hnd.c will take care */
2301                 return true;
2302 @@ -747,7 +747,7 @@ static bool api_frsapi_WriterCommand(str
2303
2304         r->out.result = _frsapi_WriterCommand(p, r);
2305
2306 -       if (p->rng_fault_state) {
2307 +       if (p->fault_state) {
2308                 talloc_free(r);
2309                 /* Return true here, srv_pipe_hnd.c will take care */
2310                 return true;
2311 @@ -820,7 +820,7 @@ static bool api_frsapi_ForceReplication(
2312
2313         r->out.result = _frsapi_ForceReplication(p, r);
2314
2315 -       if (p->rng_fault_state) {
2316 +       if (p->fault_state) {
2317                 talloc_free(r);
2318                 /* Return true here, srv_pipe_hnd.c will take care */
2319                 return true;
2320 --- a/source3/librpc/gen_ndr/srv_frsrpc.c
2321 +++ b/source3/librpc/gen_ndr/srv_frsrpc.c
2322 @@ -44,7 +44,7 @@ static bool api_frsrpc_FrsSendCommPkt(st
2323
2324         r->out.result = _frsrpc_FrsSendCommPkt(p, r);
2325
2326 -       if (p->rng_fault_state) {
2327 +       if (p->fault_state) {
2328                 talloc_free(r);
2329                 /* Return true here, srv_pipe_hnd.c will take care */
2330                 return true;
2331 @@ -117,7 +117,7 @@ static bool api_frsrpc_FrsVerifyPromotio
2332
2333         r->out.result = _frsrpc_FrsVerifyPromotionParent(p, r);
2334
2335 -       if (p->rng_fault_state) {
2336 +       if (p->fault_state) {
2337                 talloc_free(r);
2338                 /* Return true here, srv_pipe_hnd.c will take care */
2339                 return true;
2340 @@ -192,7 +192,7 @@ static bool api_frsrpc_FrsStartPromotion
2341         r->out.parent_guid = r->in.parent_guid;
2342         r->out.result = _frsrpc_FrsStartPromotionParent(p, r);
2343
2344 -       if (p->rng_fault_state) {
2345 +       if (p->fault_state) {
2346                 talloc_free(r);
2347                 /* Return true here, srv_pipe_hnd.c will take care */
2348                 return true;
2349 @@ -265,7 +265,7 @@ static bool api_frsrpc_FrsNOP(struct pip
2350
2351         r->out.result = _frsrpc_FrsNOP(p, r);
2352
2353 -       if (p->rng_fault_state) {
2354 +       if (p->fault_state) {
2355                 talloc_free(r);
2356                 /* Return true here, srv_pipe_hnd.c will take care */
2357                 return true;
2358 @@ -338,7 +338,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE(s
2359
2360         _FRSRPC_BACKUP_COMPLETE(p, r);
2361
2362 -       if (p->rng_fault_state) {
2363 +       if (p->fault_state) {
2364                 talloc_free(r);
2365                 /* Return true here, srv_pipe_hnd.c will take care */
2366                 return true;
2367 @@ -411,7 +411,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE_5
2368
2369         _FRSRPC_BACKUP_COMPLETE_5(p, r);
2370
2371 -       if (p->rng_fault_state) {
2372 +       if (p->fault_state) {
2373                 talloc_free(r);
2374                 /* Return true here, srv_pipe_hnd.c will take care */
2375                 return true;
2376 @@ -484,7 +484,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE_6
2377
2378         _FRSRPC_BACKUP_COMPLETE_6(p, r);
2379
2380 -       if (p->rng_fault_state) {
2381 +       if (p->fault_state) {
2382                 talloc_free(r);
2383                 /* Return true here, srv_pipe_hnd.c will take care */
2384                 return true;
2385 @@ -557,7 +557,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE_7
2386
2387         _FRSRPC_BACKUP_COMPLETE_7(p, r);
2388
2389 -       if (p->rng_fault_state) {
2390 +       if (p->fault_state) {
2391                 talloc_free(r);
2392                 /* Return true here, srv_pipe_hnd.c will take care */
2393                 return true;
2394 @@ -630,7 +630,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE_8
2395
2396         _FRSRPC_BACKUP_COMPLETE_8(p, r);
2397
2398 -       if (p->rng_fault_state) {
2399 +       if (p->fault_state) {
2400                 talloc_free(r);
2401                 /* Return true here, srv_pipe_hnd.c will take care */
2402                 return true;
2403 @@ -703,7 +703,7 @@ static bool api_FRSRPC_BACKUP_COMPLETE_9
2404
2405         _FRSRPC_BACKUP_COMPLETE_9(p, r);
2406
2407 -       if (p->rng_fault_state) {
2408 +       if (p->fault_state) {
2409                 talloc_free(r);
2410                 /* Return true here, srv_pipe_hnd.c will take care */
2411                 return true;
2412 @@ -776,7 +776,7 @@ static bool api_FRSRPC_VERIFY_PROMOTION_
2413
2414         _FRSRPC_VERIFY_PROMOTION_PARENT_EX(p, r);
2415
2416 -       if (p->rng_fault_state) {
2417 +       if (p->fault_state) {
2418                 talloc_free(r);
2419                 /* Return true here, srv_pipe_hnd.c will take care */
2420                 return true;
2421 --- a/source3/librpc/gen_ndr/srv_frstrans.c
2422 +++ b/source3/librpc/gen_ndr/srv_frstrans.c
2423 @@ -44,7 +44,7 @@ static bool api_frstrans_CheckConnectivi
2424
2425         r->out.result = _frstrans_CheckConnectivity(p, r);
2426
2427 -       if (p->rng_fault_state) {
2428 +       if (p->fault_state) {
2429                 talloc_free(r);
2430                 /* Return true here, srv_pipe_hnd.c will take care */
2431                 return true;
2432 @@ -130,7 +130,7 @@ static bool api_frstrans_EstablishConnec
2433
2434         r->out.result = _frstrans_EstablishConnection(p, r);
2435
2436 -       if (p->rng_fault_state) {
2437 +       if (p->fault_state) {
2438                 talloc_free(r);
2439                 /* Return true here, srv_pipe_hnd.c will take care */
2440                 return true;
2441 @@ -203,7 +203,7 @@ static bool api_frstrans_EstablishSessio
2442
2443         r->out.result = _frstrans_EstablishSession(p, r);
2444
2445 -       if (p->rng_fault_state) {
2446 +       if (p->fault_state) {
2447                 talloc_free(r);
2448                 /* Return true here, srv_pipe_hnd.c will take care */
2449                 return true;
2450 @@ -307,7 +307,7 @@ static bool api_frstrans_RequestUpdates(
2451
2452         r->out.result = _frstrans_RequestUpdates(p, r);
2453
2454 -       if (p->rng_fault_state) {
2455 +       if (p->fault_state) {
2456                 talloc_free(r);
2457                 /* Return true here, srv_pipe_hnd.c will take care */
2458                 return true;
2459 @@ -380,7 +380,7 @@ static bool api_frstrans_RequestVersionV
2460
2461         r->out.result = _frstrans_RequestVersionVector(p, r);
2462
2463 -       if (p->rng_fault_state) {
2464 +       if (p->fault_state) {
2465                 talloc_free(r);
2466                 /* Return true here, srv_pipe_hnd.c will take care */
2467                 return true;
2468 @@ -460,7 +460,7 @@ static bool api_frstrans_AsyncPoll(struc
2469
2470         r->out.result = _frstrans_AsyncPoll(p, r);
2471
2472 -       if (p->rng_fault_state) {
2473 +       if (p->fault_state) {
2474                 talloc_free(r);
2475                 /* Return true here, srv_pipe_hnd.c will take care */
2476                 return true;
2477 @@ -533,7 +533,7 @@ static bool api_FRSTRANS_REQUEST_RECORDS
2478
2479         _FRSTRANS_REQUEST_RECORDS(p, r);
2480
2481 -       if (p->rng_fault_state) {
2482 +       if (p->fault_state) {
2483                 talloc_free(r);
2484                 /* Return true here, srv_pipe_hnd.c will take care */
2485                 return true;
2486 @@ -606,7 +606,7 @@ static bool api_FRSTRANS_UPDATE_CANCEL(s
2487
2488         _FRSTRANS_UPDATE_CANCEL(p, r);
2489
2490 -       if (p->rng_fault_state) {
2491 +       if (p->fault_state) {
2492                 talloc_free(r);
2493                 /* Return true here, srv_pipe_hnd.c will take care */
2494                 return true;
2495 @@ -679,7 +679,7 @@ static bool api_FRSTRANS_RAW_GET_FILE_DA
2496
2497         _FRSTRANS_RAW_GET_FILE_DATA(p, r);
2498
2499 -       if (p->rng_fault_state) {
2500 +       if (p->fault_state) {
2501                 talloc_free(r);
2502                 /* Return true here, srv_pipe_hnd.c will take care */
2503                 return true;
2504 @@ -752,7 +752,7 @@ static bool api_FRSTRANS_RDC_GET_SIGNATU
2505
2506         _FRSTRANS_RDC_GET_SIGNATURES(p, r);
2507
2508 -       if (p->rng_fault_state) {
2509 +       if (p->fault_state) {
2510                 talloc_free(r);
2511                 /* Return true here, srv_pipe_hnd.c will take care */
2512                 return true;
2513 @@ -825,7 +825,7 @@ static bool api_FRSTRANS_RDC_PUSH_SOURCE
2514
2515         _FRSTRANS_RDC_PUSH_SOURCE_NEEDS(p, r);
2516
2517 -       if (p->rng_fault_state) {
2518 +       if (p->fault_state) {
2519                 talloc_free(r);
2520                 /* Return true here, srv_pipe_hnd.c will take care */
2521                 return true;
2522 @@ -898,7 +898,7 @@ static bool api_FRSTRANS_RDC_GET_FILE_DA
2523
2524         _FRSTRANS_RDC_GET_FILE_DATA(p, r);
2525
2526 -       if (p->rng_fault_state) {
2527 +       if (p->fault_state) {
2528                 talloc_free(r);
2529                 /* Return true here, srv_pipe_hnd.c will take care */
2530                 return true;
2531 @@ -971,7 +971,7 @@ static bool api_FRSTRANS_RDC_CLOSE(struc
2532
2533         _FRSTRANS_RDC_CLOSE(p, r);
2534
2535 -       if (p->rng_fault_state) {
2536 +       if (p->fault_state) {
2537                 talloc_free(r);
2538                 /* Return true here, srv_pipe_hnd.c will take care */
2539                 return true;
2540 @@ -1077,7 +1077,7 @@ static bool api_frstrans_InitializeFileT
2541
2542         r->out.result = _frstrans_InitializeFileTransferAsync(p, r);
2543
2544 -       if (p->rng_fault_state) {
2545 +       if (p->fault_state) {
2546                 talloc_free(r);
2547                 /* Return true here, srv_pipe_hnd.c will take care */
2548                 return true;
2549 @@ -1150,7 +1150,7 @@ static bool api_FRSTRANS_OPNUM_0E_NOT_US
2550
2551         _FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE(p, r);
2552
2553 -       if (p->rng_fault_state) {
2554 +       if (p->fault_state) {
2555                 talloc_free(r);
2556                 /* Return true here, srv_pipe_hnd.c will take care */
2557                 return true;
2558 @@ -1230,7 +1230,7 @@ static bool api_frstrans_RawGetFileDataA
2559
2560         r->out.result = _frstrans_RawGetFileDataAsync(p, r);
2561
2562 -       if (p->rng_fault_state) {
2563 +       if (p->fault_state) {
2564                 talloc_free(r);
2565                 /* Return true here, srv_pipe_hnd.c will take care */
2566                 return true;
2567 @@ -1310,7 +1310,7 @@ static bool api_frstrans_RdcGetFileDataA
2568
2569         r->out.result = _frstrans_RdcGetFileDataAsync(p, r);
2570
2571 -       if (p->rng_fault_state) {
2572 +       if (p->fault_state) {
2573                 talloc_free(r);
2574                 /* Return true here, srv_pipe_hnd.c will take care */
2575                 return true;
2576 --- a/source3/librpc/gen_ndr/srv_initshutdown.c
2577 +++ b/source3/librpc/gen_ndr/srv_initshutdown.c
2578 @@ -44,7 +44,7 @@ static bool api_initshutdown_Init(struct
2579
2580         r->out.result = _initshutdown_Init(p, r);
2581
2582 -       if (p->rng_fault_state) {
2583 +       if (p->fault_state) {
2584                 talloc_free(r);
2585                 /* Return true here, srv_pipe_hnd.c will take care */
2586                 return true;
2587 @@ -117,7 +117,7 @@ static bool api_initshutdown_Abort(struc
2588
2589         r->out.result = _initshutdown_Abort(p, r);
2590
2591 -       if (p->rng_fault_state) {
2592 +       if (p->fault_state) {
2593                 talloc_free(r);
2594                 /* Return true here, srv_pipe_hnd.c will take care */
2595                 return true;
2596 @@ -190,7 +190,7 @@ static bool api_initshutdown_InitEx(stru
2597
2598         r->out.result = _initshutdown_InitEx(p, r);
2599
2600 -       if (p->rng_fault_state) {
2601 +       if (p->fault_state) {
2602                 talloc_free(r);
2603                 /* Return true here, srv_pipe_hnd.c will take care */
2604                 return true;
2605 --- a/source3/librpc/gen_ndr/srv_keysvc.c
2606 +++ b/source3/librpc/gen_ndr/srv_keysvc.c
2607 @@ -44,7 +44,7 @@ static bool api_keysvc_Unknown0(struct p
2608
2609         r->out.result = _keysvc_Unknown0(p, r);
2610
2611 -       if (p->rng_fault_state) {
2612 +       if (p->fault_state) {
2613                 talloc_free(r);
2614                 /* Return true here, srv_pipe_hnd.c will take care */
2615                 return true;
2616 --- a/source3/librpc/gen_ndr/srv_krb5pac.c
2617 +++ b/source3/librpc/gen_ndr/srv_krb5pac.c
2618 @@ -44,7 +44,7 @@ static bool api_decode_pac(struct pipes_
2619
2620         _decode_pac(p, r);
2621
2622 -       if (p->rng_fault_state) {
2623 +       if (p->fault_state) {
2624                 talloc_free(r);
2625                 /* Return true here, srv_pipe_hnd.c will take care */
2626                 return true;
2627 @@ -117,7 +117,7 @@ static bool api_decode_pac_raw(struct pi
2628
2629         _decode_pac_raw(p, r);
2630
2631 -       if (p->rng_fault_state) {
2632 +       if (p->fault_state) {
2633                 talloc_free(r);
2634                 /* Return true here, srv_pipe_hnd.c will take care */
2635                 return true;
2636 @@ -190,7 +190,7 @@ static bool api_decode_login_info(struct
2637
2638         _decode_login_info(p, r);
2639
2640 -       if (p->rng_fault_state) {
2641 +       if (p->fault_state) {
2642                 talloc_free(r);
2643                 /* Return true here, srv_pipe_hnd.c will take care */
2644                 return true;
2645 @@ -263,7 +263,7 @@ static bool api_decode_login_info_ctr(st
2646
2647         _decode_login_info_ctr(p, r);
2648
2649 -       if (p->rng_fault_state) {
2650 +       if (p->fault_state) {
2651                 talloc_free(r);
2652                 /* Return true here, srv_pipe_hnd.c will take care */
2653                 return true;
2654 @@ -336,7 +336,7 @@ static bool api_decode_pac_validate(stru
2655
2656         _decode_pac_validate(p, r);
2657
2658 -       if (p->rng_fault_state) {
2659 +       if (p->fault_state) {
2660                 talloc_free(r);
2661                 /* Return true here, srv_pipe_hnd.c will take care */
2662                 return true;
2663 --- a/source3/librpc/gen_ndr/srv_libnetapi.c
2664 +++ b/source3/librpc/gen_ndr/srv_libnetapi.c
2665 @@ -44,7 +44,7 @@ static bool api_NetJoinDomain(struct pip
2666
2667         r->out.result = _NetJoinDomain(p, r);
2668
2669 -       if (p->rng_fault_state) {
2670 +       if (p->fault_state) {
2671                 talloc_free(r);
2672                 /* Return true here, srv_pipe_hnd.c will take care */
2673                 return true;
2674 @@ -117,7 +117,7 @@ static bool api_NetUnjoinDomain(struct p
2675
2676         r->out.result = _NetUnjoinDomain(p, r);
2677
2678 -       if (p->rng_fault_state) {
2679 +       if (p->fault_state) {
2680                 talloc_free(r);
2681                 /* Return true here, srv_pipe_hnd.c will take care */
2682                 return true;
2683 @@ -203,7 +203,7 @@ static bool api_NetGetJoinInformation(st
2684
2685         r->out.result = _NetGetJoinInformation(p, r);
2686
2687 -       if (p->rng_fault_state) {
2688 +       if (p->fault_state) {
2689                 talloc_free(r);
2690                 /* Return true here, srv_pipe_hnd.c will take care */
2691                 return true;
2692 @@ -289,7 +289,7 @@ static bool api_NetGetJoinableOUs(struct
2693
2694         r->out.result = _NetGetJoinableOUs(p, r);
2695
2696 -       if (p->rng_fault_state) {
2697 +       if (p->fault_state) {
2698                 talloc_free(r);
2699                 /* Return true here, srv_pipe_hnd.c will take care */
2700                 return true;
2701 @@ -362,7 +362,7 @@ static bool api_NetRenameMachineInDomain
2702
2703         r->out.result = _NetRenameMachineInDomain(p, r);
2704
2705 -       if (p->rng_fault_state) {
2706 +       if (p->fault_state) {
2707                 talloc_free(r);
2708                 /* Return true here, srv_pipe_hnd.c will take care */
2709                 return true;
2710 @@ -442,7 +442,7 @@ static bool api_NetServerGetInfo(struct
2711
2712         r->out.result = _NetServerGetInfo(p, r);
2713
2714 -       if (p->rng_fault_state) {
2715 +       if (p->fault_state) {
2716                 talloc_free(r);
2717                 /* Return true here, srv_pipe_hnd.c will take care */
2718                 return true;
2719 @@ -522,7 +522,7 @@ static bool api_NetServerSetInfo(struct
2720
2721         r->out.result = _NetServerSetInfo(p, r);
2722
2723 -       if (p->rng_fault_state) {
2724 +       if (p->fault_state) {
2725                 talloc_free(r);
2726                 /* Return true here, srv_pipe_hnd.c will take care */
2727                 return true;
2728 @@ -602,7 +602,7 @@ static bool api_NetGetDCName(struct pipe
2729
2730         r->out.result = _NetGetDCName(p, r);
2731
2732 -       if (p->rng_fault_state) {
2733 +       if (p->fault_state) {
2734                 talloc_free(r);
2735                 /* Return true here, srv_pipe_hnd.c will take care */
2736                 return true;
2737 @@ -682,7 +682,7 @@ static bool api_NetGetAnyDCName(struct p
2738
2739         r->out.result = _NetGetAnyDCName(p, r);
2740
2741 -       if (p->rng_fault_state) {
2742 +       if (p->fault_state) {
2743                 talloc_free(r);
2744                 /* Return true here, srv_pipe_hnd.c will take care */
2745                 return true;
2746 @@ -762,7 +762,7 @@ static bool api_DsGetDcName(struct pipes
2747
2748         r->out.result = _DsGetDcName(p, r);
2749
2750 -       if (p->rng_fault_state) {
2751 +       if (p->fault_state) {
2752                 talloc_free(r);
2753                 /* Return true here, srv_pipe_hnd.c will take care */
2754                 return true;
2755 @@ -842,7 +842,7 @@ static bool api_NetUserAdd(struct pipes_
2756
2757         r->out.result = _NetUserAdd(p, r);
2758
2759 -       if (p->rng_fault_state) {
2760 +       if (p->fault_state) {
2761                 talloc_free(r);
2762                 /* Return true here, srv_pipe_hnd.c will take care */
2763                 return true;
2764 @@ -915,7 +915,7 @@ static bool api_NetUserDel(struct pipes_
2765
2766         r->out.result = _NetUserDel(p, r);
2767
2768 -       if (p->rng_fault_state) {
2769 +       if (p->fault_state) {
2770                 talloc_free(r);
2771                 /* Return true here, srv_pipe_hnd.c will take care */
2772                 return true;
2773 @@ -1008,7 +1008,7 @@ static bool api_NetUserEnum(struct pipes
2774
2775         r->out.result = _NetUserEnum(p, r);
2776
2777 -       if (p->rng_fault_state) {
2778 +       if (p->fault_state) {
2779                 talloc_free(r);
2780                 /* Return true here, srv_pipe_hnd.c will take care */
2781                 return true;
2782 @@ -1081,7 +1081,7 @@ static bool api_NetUserChangePassword(st
2783
2784         r->out.result = _NetUserChangePassword(p, r);
2785
2786 -       if (p->rng_fault_state) {
2787 +       if (p->fault_state) {
2788                 talloc_free(r);
2789                 /* Return true here, srv_pipe_hnd.c will take care */
2790                 return true;
2791 @@ -1161,7 +1161,7 @@ static bool api_NetUserGetInfo(struct pi
2792
2793         r->out.result = _NetUserGetInfo(p, r);
2794
2795 -       if (p->rng_fault_state) {
2796 +       if (p->fault_state) {
2797                 talloc_free(r);
2798                 /* Return true here, srv_pipe_hnd.c will take care */
2799                 return true;
2800 @@ -1241,7 +1241,7 @@ static bool api_NetUserSetInfo(struct pi
2801
2802         r->out.result = _NetUserSetInfo(p, r);
2803
2804 -       if (p->rng_fault_state) {
2805 +       if (p->fault_state) {
2806                 talloc_free(r);
2807                 /* Return true here, srv_pipe_hnd.c will take care */
2808                 return true;
2809 @@ -1333,7 +1333,7 @@ static bool api_NetUserGetGroups(struct
2810
2811         r->out.result = _NetUserGetGroups(p, r);
2812
2813 -       if (p->rng_fault_state) {
2814 +       if (p->fault_state) {
2815                 talloc_free(r);
2816                 /* Return true here, srv_pipe_hnd.c will take care */
2817                 return true;
2818 @@ -1406,7 +1406,7 @@ static bool api_NetUserSetGroups(struct
2819
2820         r->out.result = _NetUserSetGroups(p, r);
2821
2822 -       if (p->rng_fault_state) {
2823 +       if (p->fault_state) {
2824                 talloc_free(r);
2825                 /* Return true here, srv_pipe_hnd.c will take care */
2826                 return true;
2827 @@ -1498,7 +1498,7 @@ static bool api_NetUserGetLocalGroups(st
2828
2829         r->out.result = _NetUserGetLocalGroups(p, r);
2830
2831 -       if (p->rng_fault_state) {
2832 +       if (p->fault_state) {
2833                 talloc_free(r);
2834                 /* Return true here, srv_pipe_hnd.c will take care */
2835                 return true;
2836 @@ -1578,7 +1578,7 @@ static bool api_NetUserModalsGet(struct
2837
2838         r->out.result = _NetUserModalsGet(p, r);
2839
2840 -       if (p->rng_fault_state) {
2841 +       if (p->fault_state) {
2842                 talloc_free(r);
2843                 /* Return true here, srv_pipe_hnd.c will take care */
2844                 return true;
2845 @@ -1658,7 +1658,7 @@ static bool api_NetUserModalsSet(struct
2846
2847         r->out.result = _NetUserModalsSet(p, r);
2848
2849 -       if (p->rng_fault_state) {
2850 +       if (p->fault_state) {
2851                 talloc_free(r);
2852                 /* Return true here, srv_pipe_hnd.c will take care */
2853                 return true;
2854 @@ -1744,7 +1744,7 @@ static bool api_NetQueryDisplayInformati
2855
2856         r->out.result = _NetQueryDisplayInformation(p, r);
2857
2858 -       if (p->rng_fault_state) {
2859 +       if (p->fault_state) {
2860                 talloc_free(r);
2861                 /* Return true here, srv_pipe_hnd.c will take care */
2862                 return true;
2863 @@ -1824,7 +1824,7 @@ static bool api_NetGroupAdd(struct pipes
2864
2865         r->out.result = _NetGroupAdd(p, r);
2866
2867 -       if (p->rng_fault_state) {
2868 +       if (p->fault_state) {
2869                 talloc_free(r);
2870                 /* Return true here, srv_pipe_hnd.c will take care */
2871                 return true;
2872 @@ -1897,7 +1897,7 @@ static bool api_NetGroupDel(struct pipes
2873
2874         r->out.result = _NetGroupDel(p, r);
2875
2876 -       if (p->rng_fault_state) {
2877 +       if (p->fault_state) {
2878                 talloc_free(r);
2879                 /* Return true here, srv_pipe_hnd.c will take care */
2880                 return true;
2881 @@ -1990,7 +1990,7 @@ static bool api_NetGroupEnum(struct pipe
2882
2883         r->out.result = _NetGroupEnum(p, r);
2884
2885 -       if (p->rng_fault_state) {
2886 +       if (p->fault_state) {
2887                 talloc_free(r);
2888                 /* Return true here, srv_pipe_hnd.c will take care */
2889                 return true;
2890 @@ -2070,7 +2070,7 @@ static bool api_NetGroupSetInfo(struct p
2891
2892         r->out.result = _NetGroupSetInfo(p, r);
2893
2894 -       if (p->rng_fault_state) {
2895 +       if (p->fault_state) {
2896                 talloc_free(r);
2897                 /* Return true here, srv_pipe_hnd.c will take care */
2898                 return true;
2899 @@ -2150,7 +2150,7 @@ static bool api_NetGroupGetInfo(struct p
2900
2901         r->out.result = _NetGroupGetInfo(p, r);
2902
2903 -       if (p->rng_fault_state) {
2904 +       if (p->fault_state) {
2905                 talloc_free(r);
2906                 /* Return true here, srv_pipe_hnd.c will take care */
2907                 return true;
2908 @@ -2223,7 +2223,7 @@ static bool api_NetGroupAddUser(struct p
2909
2910         r->out.result = _NetGroupAddUser(p, r);
2911
2912 -       if (p->rng_fault_state) {
2913 +       if (p->fault_state) {
2914                 talloc_free(r);
2915                 /* Return true here, srv_pipe_hnd.c will take care */
2916                 return true;
2917 @@ -2296,7 +2296,7 @@ static bool api_NetGroupDelUser(struct p
2918
2919         r->out.result = _NetGroupDelUser(p, r);
2920
2921 -       if (p->rng_fault_state) {
2922 +       if (p->fault_state) {
2923                 talloc_free(r);
2924                 /* Return true here, srv_pipe_hnd.c will take care */
2925                 return true;
2926 @@ -2389,7 +2389,7 @@ static bool api_NetGroupGetUsers(struct
2927
2928         r->out.result = _NetGroupGetUsers(p, r);
2929
2930 -       if (p->rng_fault_state) {
2931 +       if (p->fault_state) {
2932                 talloc_free(r);
2933                 /* Return true here, srv_pipe_hnd.c will take care */
2934                 return true;
2935 @@ -2462,7 +2462,7 @@ static bool api_NetGroupSetUsers(struct
2936
2937         r->out.result = _NetGroupSetUsers(p, r);
2938
2939 -       if (p->rng_fault_state) {
2940 +       if (p->fault_state) {
2941                 talloc_free(r);
2942                 /* Return true here, srv_pipe_hnd.c will take care */
2943                 return true;
2944 @@ -2542,7 +2542,7 @@ static bool api_NetLocalGroupAdd(struct
2945
2946         r->out.result = _NetLocalGroupAdd(p, r);
2947
2948 -       if (p->rng_fault_state) {
2949 +       if (p->fault_state) {
2950                 talloc_free(r);
2951                 /* Return true here, srv_pipe_hnd.c will take care */
2952                 return true;
2953 @@ -2615,7 +2615,7 @@ static bool api_NetLocalGroupDel(struct
2954
2955         r->out.result = _NetLocalGroupDel(p, r);
2956
2957 -       if (p->rng_fault_state) {
2958 +       if (p->fault_state) {
2959                 talloc_free(r);
2960                 /* Return true here, srv_pipe_hnd.c will take care */
2961                 return true;
2962 @@ -2695,7 +2695,7 @@ static bool api_NetLocalGroupGetInfo(str
2963
2964         r->out.result = _NetLocalGroupGetInfo(p, r);
2965
2966 -       if (p->rng_fault_state) {
2967 +       if (p->fault_state) {
2968                 talloc_free(r);
2969                 /* Return true here, srv_pipe_hnd.c will take care */
2970                 return true;
2971 @@ -2775,7 +2775,7 @@ static bool api_NetLocalGroupSetInfo(str
2972
2973         r->out.result = _NetLocalGroupSetInfo(p, r);
2974
2975 -       if (p->rng_fault_state) {
2976 +       if (p->fault_state) {
2977                 talloc_free(r);
2978                 /* Return true here, srv_pipe_hnd.c will take care */
2979                 return true;
2980 @@ -2868,7 +2868,7 @@ static bool api_NetLocalGroupEnum(struct
2981
2982         r->out.result = _NetLocalGroupEnum(p, r);
2983
2984 -       if (p->rng_fault_state) {
2985 +       if (p->fault_state) {
2986                 talloc_free(r);
2987                 /* Return true here, srv_pipe_hnd.c will take care */
2988                 return true;
2989 @@ -2941,7 +2941,7 @@ static bool api_NetLocalGroupAddMembers(
2990
2991         r->out.result = _NetLocalGroupAddMembers(p, r);
2992
2993 -       if (p->rng_fault_state) {
2994 +       if (p->fault_state) {
2995                 talloc_free(r);
2996                 /* Return true here, srv_pipe_hnd.c will take care */
2997                 return true;
2998 @@ -3014,7 +3014,7 @@ static bool api_NetLocalGroupDelMembers(
2999
3000         r->out.result = _NetLocalGroupDelMembers(p, r);
3001
3002 -       if (p->rng_fault_state) {
3003 +       if (p->fault_state) {
3004                 talloc_free(r);
3005                 /* Return true here, srv_pipe_hnd.c will take care */
3006                 return true;
3007 @@ -3107,7 +3107,7 @@ static bool api_NetLocalGroupGetMembers(
3008
3009         r->out.result = _NetLocalGroupGetMembers(p, r);
3010
3011 -       if (p->rng_fault_state) {
3012 +       if (p->fault_state) {
3013                 talloc_free(r);
3014                 /* Return true here, srv_pipe_hnd.c will take care */
3015                 return true;
3016 @@ -3180,7 +3180,7 @@ static bool api_NetLocalGroupSetMembers(
3017
3018         r->out.result = _NetLocalGroupSetMembers(p, r);
3019
3020 -       if (p->rng_fault_state) {
3021 +       if (p->fault_state) {
3022                 talloc_free(r);
3023                 /* Return true here, srv_pipe_hnd.c will take care */
3024                 return true;
3025 @@ -3260,7 +3260,7 @@ static bool api_NetRemoteTOD(struct pipe
3026
3027         r->out.result = _NetRemoteTOD(p, r);
3028
3029 -       if (p->rng_fault_state) {
3030 +       if (p->fault_state) {
3031                 talloc_free(r);
3032                 /* Return true here, srv_pipe_hnd.c will take care */
3033                 return true;
3034 @@ -3340,7 +3340,7 @@ static bool api_NetShareAdd(struct pipes
3035
3036         r->out.result = _NetShareAdd(p, r);
3037
3038 -       if (p->rng_fault_state) {
3039 +       if (p->fault_state) {
3040                 talloc_free(r);
3041                 /* Return true here, srv_pipe_hnd.c will take care */
3042                 return true;
3043 @@ -3413,7 +3413,7 @@ static bool api_NetShareDel(struct pipes
3044
3045         r->out.result = _NetShareDel(p, r);
3046
3047 -       if (p->rng_fault_state) {
3048 +       if (p->fault_state) {
3049                 talloc_free(r);
3050                 /* Return true here, srv_pipe_hnd.c will take care */
3051                 return true;
3052 @@ -3506,7 +3506,7 @@ static bool api_NetShareEnum(struct pipe
3053
3054         r->out.result = _NetShareEnum(p, r);
3055
3056 -       if (p->rng_fault_state) {
3057 +       if (p->fault_state) {
3058                 talloc_free(r);
3059                 /* Return true here, srv_pipe_hnd.c will take care */
3060                 return true;
3061 @@ -3586,7 +3586,7 @@ static bool api_NetShareGetInfo(struct p
3062
3063         r->out.result = _NetShareGetInfo(p, r);
3064
3065 -       if (p->rng_fault_state) {
3066 +       if (p->fault_state) {
3067                 talloc_free(r);
3068                 /* Return true here, srv_pipe_hnd.c will take care */
3069                 return true;
3070 @@ -3666,7 +3666,7 @@ static bool api_NetShareSetInfo(struct p
3071
3072         r->out.result = _NetShareSetInfo(p, r);
3073
3074 -       if (p->rng_fault_state) {
3075 +       if (p->fault_state) {
3076                 talloc_free(r);
3077                 /* Return true here, srv_pipe_hnd.c will take care */
3078                 return true;
3079 @@ -3739,7 +3739,7 @@ static bool api_NetFileClose(struct pipe
3080
3081         r->out.result = _NetFileClose(p, r);
3082
3083 -       if (p->rng_fault_state) {
3084 +       if (p->fault_state) {
3085                 talloc_free(r);
3086                 /* Return true here, srv_pipe_hnd.c will take care */
3087                 return true;
3088 @@ -3819,7 +3819,7 @@ static bool api_NetFileGetInfo(struct pi
3089
3090         r->out.result = _NetFileGetInfo(p, r);
3091
3092 -       if (p->rng_fault_state) {
3093 +       if (p->fault_state) {
3094                 talloc_free(r);
3095                 /* Return true here, srv_pipe_hnd.c will take care */
3096                 return true;
3097 @@ -3912,7 +3912,7 @@ static bool api_NetFileEnum(struct pipes
3098
3099         r->out.result = _NetFileEnum(p, r);
3100
3101 -       if (p->rng_fault_state) {
3102 +       if (p->fault_state) {
3103                 talloc_free(r);
3104                 /* Return true here, srv_pipe_hnd.c will take care */
3105                 return true;
3106 @@ -3985,7 +3985,7 @@ static bool api_NetShutdownInit(struct p
3107
3108         r->out.result = _NetShutdownInit(p, r);
3109
3110 -       if (p->rng_fault_state) {
3111 +       if (p->fault_state) {
3112                 talloc_free(r);
3113                 /* Return true here, srv_pipe_hnd.c will take care */
3114                 return true;
3115 @@ -4058,7 +4058,7 @@ static bool api_NetShutdownAbort(struct
3116
3117         r->out.result = _NetShutdownAbort(p, r);
3118
3119 -       if (p->rng_fault_state) {
3120 +       if (p->fault_state) {
3121                 talloc_free(r);
3122                 /* Return true here, srv_pipe_hnd.c will take care */
3123                 return true;
3124 @@ -4138,7 +4138,7 @@ static bool api_I_NetLogonControl(struct
3125
3126         r->out.result = _I_NetLogonControl(p, r);
3127
3128 -       if (p->rng_fault_state) {
3129 +       if (p->fault_state) {
3130                 talloc_free(r);
3131                 /* Return true here, srv_pipe_hnd.c will take care */
3132                 return true;
3133 @@ -4218,7 +4218,7 @@ static bool api_I_NetLogonControl2(struc
3134
3135         r->out.result = _I_NetLogonControl2(p, r);
3136
3137 -       if (p->rng_fault_state) {
3138 +       if (p->fault_state) {
3139                 talloc_free(r);
3140                 /* Return true here, srv_pipe_hnd.c will take care */
3141                 return true;
3142 --- a/source3/librpc/gen_ndr/srv_lsa.c
3143 +++ b/source3/librpc/gen_ndr/srv_lsa.c
3144 @@ -46,7 +46,7 @@ static bool api_lsa_Close(struct pipes_s
3145         r->out.handle = r->in.handle;
3146         r->out.result = _lsa_Close(p, r);
3147
3148 -       if (p->rng_fault_state) {
3149 +       if (p->fault_state) {
3150                 talloc_free(r);
3151                 /* Return true here, srv_pipe_hnd.c will take care */
3152                 return true;
3153 @@ -119,7 +119,7 @@ static bool api_lsa_Delete(struct pipes_
3154
3155         r->out.result = _lsa_Delete(p, r);
3156
3157 -       if (p->rng_fault_state) {
3158 +       if (p->fault_state) {
3159                 talloc_free(r);
3160                 /* Return true here, srv_pipe_hnd.c will take care */
3161                 return true;
3162 @@ -200,7 +200,7 @@ static bool api_lsa_EnumPrivs(struct pip
3163
3164         r->out.result = _lsa_EnumPrivs(p, r);
3165
3166 -       if (p->rng_fault_state) {
3167 +       if (p->fault_state) {
3168                 talloc_free(r);
3169                 /* Return true here, srv_pipe_hnd.c will take care */
3170                 return true;
3171 @@ -280,7 +280,7 @@ static bool api_lsa_QuerySecurity(struct
3172
3173         r->out.result = _lsa_QuerySecurity(p, r);
3174
3175 -       if (p->rng_fault_state) {
3176 +       if (p->fault_state) {
3177                 talloc_free(r);
3178                 /* Return true here, srv_pipe_hnd.c will take care */
3179                 return true;
3180 @@ -353,7 +353,7 @@ static bool api_lsa_SetSecObj(struct pip
3181
3182         r->out.result = _lsa_SetSecObj(p, r);
3183
3184 -       if (p->rng_fault_state) {
3185 +       if (p->fault_state) {
3186                 talloc_free(r);
3187                 /* Return true here, srv_pipe_hnd.c will take care */
3188                 return true;
3189 @@ -426,7 +426,7 @@ static bool api_lsa_ChangePassword(struc
3190
3191         r->out.result = _lsa_ChangePassword(p, r);
3192
3193 -       if (p->rng_fault_state) {
3194 +       if (p->fault_state) {
3195                 talloc_free(r);
3196                 /* Return true here, srv_pipe_hnd.c will take care */
3197                 return true;
3198 @@ -506,7 +506,7 @@ static bool api_lsa_OpenPolicy(struct pi
3199
3200         r->out.result = _lsa_OpenPolicy(p, r);
3201
3202 -       if (p->rng_fault_state) {
3203 +       if (p->fault_state) {
3204                 talloc_free(r);
3205                 /* Return true here, srv_pipe_hnd.c will take care */
3206                 return true;
3207 @@ -586,7 +586,7 @@ static bool api_lsa_QueryInfoPolicy(stru
3208
3209         r->out.result = _lsa_QueryInfoPolicy(p, r);
3210
3211 -       if (p->rng_fault_state) {
3212 +       if (p->fault_state) {
3213                 talloc_free(r);
3214                 /* Return true here, srv_pipe_hnd.c will take care */
3215                 return true;
3216 @@ -659,7 +659,7 @@ static bool api_lsa_SetInfoPolicy(struct
3217
3218         r->out.result = _lsa_SetInfoPolicy(p, r);
3219
3220 -       if (p->rng_fault_state) {
3221 +       if (p->fault_state) {
3222                 talloc_free(r);
3223                 /* Return true here, srv_pipe_hnd.c will take care */
3224                 return true;
3225 @@ -732,7 +732,7 @@ static bool api_lsa_ClearAuditLog(struct
3226
3227         r->out.result = _lsa_ClearAuditLog(p, r);
3228
3229 -       if (p->rng_fault_state) {
3230 +       if (p->fault_state) {
3231                 talloc_free(r);
3232                 /* Return true here, srv_pipe_hnd.c will take care */
3233                 return true;
3234 @@ -812,7 +812,7 @@ static bool api_lsa_CreateAccount(struct
3235
3236         r->out.result = _lsa_CreateAccount(p, r);
3237
3238 -       if (p->rng_fault_state) {
3239 +       if (p->fault_state) {
3240                 talloc_free(r);
3241                 /* Return true here, srv_pipe_hnd.c will take care */
3242                 return true;
3243 @@ -893,7 +893,7 @@ static bool api_lsa_EnumAccounts(struct
3244
3245         r->out.result = _lsa_EnumAccounts(p, r);
3246
3247 -       if (p->rng_fault_state) {
3248 +       if (p->fault_state) {
3249                 talloc_free(r);
3250                 /* Return true here, srv_pipe_hnd.c will take care */
3251                 return true;
3252 @@ -973,7 +973,7 @@ static bool api_lsa_CreateTrustedDomain(
3253
3254         r->out.result = _lsa_CreateTrustedDomain(p, r);
3255
3256 -       if (p->rng_fault_state) {
3257 +       if (p->fault_state) {
3258                 talloc_free(r);
3259                 /* Return true here, srv_pipe_hnd.c will take care */
3260                 return true;
3261 @@ -1054,7 +1054,7 @@ static bool api_lsa_EnumTrustDom(struct
3262
3263         r->out.result = _lsa_EnumTrustDom(p, r);
3264
3265 -       if (p->rng_fault_state) {
3266 +       if (p->fault_state) {
3267                 talloc_free(r);
3268                 /* Return true here, srv_pipe_hnd.c will take care */
3269                 return true;
3270 @@ -1136,7 +1136,7 @@ static bool api_lsa_LookupNames(struct p
3271
3272         r->out.result = _lsa_LookupNames(p, r);
3273
3274 -       if (p->rng_fault_state) {
3275 +       if (p->fault_state) {
3276                 talloc_free(r);
3277                 /* Return true here, srv_pipe_hnd.c will take care */
3278                 return true;
3279 @@ -1218,7 +1218,7 @@ static bool api_lsa_LookupSids(struct pi
3280
3281         r->out.result = _lsa_LookupSids(p, r);
3282
3283 -       if (p->rng_fault_state) {
3284 +       if (p->fault_state) {
3285                 talloc_free(r);
3286                 /* Return true here, srv_pipe_hnd.c will take care */
3287                 return true;
3288 @@ -1298,7 +1298,7 @@ static bool api_lsa_CreateSecret(struct
3289
3290         r->out.result = _lsa_CreateSecret(p, r);
3291
3292 -       if (p->rng_fault_state) {
3293 +       if (p->fault_state) {
3294                 talloc_free(r);
3295                 /* Return true here, srv_pipe_hnd.c will take care */
3296                 return true;
3297 @@ -1378,7 +1378,7 @@ static bool api_lsa_OpenAccount(struct p
3298
3299         r->out.result = _lsa_OpenAccount(p, r);
3300
3301 -       if (p->rng_fault_state) {
3302 +       if (p->fault_state) {
3303                 talloc_free(r);
3304                 /* Return true here, srv_pipe_hnd.c will take care */
3305                 return true;
3306 @@ -1458,7 +1458,7 @@ static bool api_lsa_EnumPrivsAccount(str
3307
3308         r->out.result = _lsa_EnumPrivsAccount(p, r);
3309
3310 -       if (p->rng_fault_state) {
3311 +       if (p->fault_state) {
3312                 talloc_free(r);
3313                 /* Return true here, srv_pipe_hnd.c will take care */
3314                 return true;
3315 @@ -1531,7 +1531,7 @@ static bool api_lsa_AddPrivilegesToAccou
3316
3317         r->out.result = _lsa_AddPrivilegesToAccount(p, r);
3318
3319 -       if (p->rng_fault_state) {
3320 +       if (p->fault_state) {
3321                 talloc_free(r);
3322                 /* Return true here, srv_pipe_hnd.c will take care */
3323                 return true;
3324 @@ -1604,7 +1604,7 @@ static bool api_lsa_RemovePrivilegesFrom
3325
3326         r->out.result = _lsa_RemovePrivilegesFromAccount(p, r);
3327
3328 -       if (p->rng_fault_state) {
3329 +       if (p->fault_state) {
3330                 talloc_free(r);
3331                 /* Return true here, srv_pipe_hnd.c will take care */
3332                 return true;
3333 @@ -1677,7 +1677,7 @@ static bool api_lsa_GetQuotasForAccount(
3334
3335         r->out.result = _lsa_GetQuotasForAccount(p, r);
3336
3337 -       if (p->rng_fault_state) {
3338 +       if (p->fault_state) {
3339                 talloc_free(r);
3340                 /* Return true here, srv_pipe_hnd.c will take care */
3341                 return true;
3342 @@ -1750,7 +1750,7 @@ static bool api_lsa_SetQuotasForAccount(
3343
3344         r->out.result = _lsa_SetQuotasForAccount(p, r);
3345
3346 -       if (p->rng_fault_state) {
3347 +       if (p->fault_state) {
3348                 talloc_free(r);
3349                 /* Return true here, srv_pipe_hnd.c will take care */
3350                 return true;
3351 @@ -1830,7 +1830,7 @@ static bool api_lsa_GetSystemAccessAccou
3352
3353         r->out.result = _lsa_GetSystemAccessAccount(p, r);
3354
3355 -       if (p->rng_fault_state) {
3356 +       if (p->fault_state) {
3357                 talloc_free(r);
3358                 /* Return true here, srv_pipe_hnd.c will take care */
3359                 return true;
3360 @@ -1903,7 +1903,7 @@ static bool api_lsa_SetSystemAccessAccou
3361
3362         r->out.result = _lsa_SetSystemAccessAccount(p, r);
3363
3364 -       if (p->rng_fault_state) {
3365 +       if (p->fault_state) {
3366                 talloc_free(r);
3367                 /* Return true here, srv_pipe_hnd.c will take care */
3368                 return true;
3369 @@ -1983,7 +1983,7 @@ static bool api_lsa_OpenTrustedDomain(st
3370
3371         r->out.result = _lsa_OpenTrustedDomain(p, r);
3372
3373 -       if (p->rng_fault_state) {
3374 +       if (p->fault_state) {
3375                 talloc_free(r);
3376                 /* Return true here, srv_pipe_hnd.c will take care */
3377                 return true;
3378 @@ -2063,7 +2063,7 @@ static bool api_lsa_QueryTrustedDomainIn
3379
3380         r->out.result = _lsa_QueryTrustedDomainInfo(p, r);
3381
3382 -       if (p->rng_fault_state) {
3383 +       if (p->fault_state) {
3384                 talloc_free(r);
3385                 /* Return true here, srv_pipe_hnd.c will take care */
3386                 return true;
3387 @@ -2136,7 +2136,7 @@ static bool api_lsa_SetInformationTruste
3388
3389         r->out.result = _lsa_SetInformationTrustedDomain(p, r);
3390
3391 -       if (p->rng_fault_state) {
3392 +       if (p->fault_state) {
3393                 talloc_free(r);
3394                 /* Return true here, srv_pipe_hnd.c will take care */
3395                 return true;
3396 @@ -2216,7 +2216,7 @@ static bool api_lsa_OpenSecret(struct pi
3397
3398         r->out.result = _lsa_OpenSecret(p, r);
3399
3400 -       if (p->rng_fault_state) {
3401 +       if (p->fault_state) {
3402                 talloc_free(r);
3403                 /* Return true here, srv_pipe_hnd.c will take care */
3404                 return true;
3405 @@ -2289,7 +2289,7 @@ static bool api_lsa_SetSecret(struct pip
3406
3407         r->out.result = _lsa_SetSecret(p, r);
3408
3409 -       if (p->rng_fault_state) {
3410 +       if (p->fault_state) {
3411                 talloc_free(r);
3412                 /* Return true here, srv_pipe_hnd.c will take care */
3413                 return true;
3414 @@ -2367,7 +2367,7 @@ static bool api_lsa_QuerySecret(struct p
3415         r->out.old_mtime = r->in.old_mtime;
3416         r->out.result = _lsa_QuerySecret(p, r);
3417
3418 -       if (p->rng_fault_state) {
3419 +       if (p->fault_state) {
3420                 talloc_free(r);
3421                 /* Return true here, srv_pipe_hnd.c will take care */
3422                 return true;
3423 @@ -2447,7 +2447,7 @@ static bool api_lsa_LookupPrivValue(stru
3424
3425         r->out.result = _lsa_LookupPrivValue(p, r);
3426
3427 -       if (p->rng_fault_state) {
3428 +       if (p->fault_state) {
3429                 talloc_free(r);
3430                 /* Return true here, srv_pipe_hnd.c will take care */
3431                 return true;
3432 @@ -2527,7 +2527,7 @@ static bool api_lsa_LookupPrivName(struc
3433
3434         r->out.result = _lsa_LookupPrivName(p, r);
3435
3436 -       if (p->rng_fault_state) {
3437 +       if (p->fault_state) {
3438                 talloc_free(r);
3439                 /* Return true here, srv_pipe_hnd.c will take care */
3440                 return true;
3441 @@ -2613,7 +2613,7 @@ static bool api_lsa_LookupPrivDisplayNam
3442
3443         r->out.result = _lsa_LookupPrivDisplayName(p, r);
3444
3445 -       if (p->rng_fault_state) {
3446 +       if (p->fault_state) {
3447                 talloc_free(r);
3448                 /* Return true here, srv_pipe_hnd.c will take care */
3449                 return true;
3450 @@ -2688,7 +2688,7 @@ static bool api_lsa_DeleteObject(struct
3451         r->out.handle = r->in.handle;
3452         r->out.result = _lsa_DeleteObject(p, r);
3453
3454 -       if (p->rng_fault_state) {
3455 +       if (p->fault_state) {
3456                 talloc_free(r);
3457                 /* Return true here, srv_pipe_hnd.c will take care */
3458                 return true;
3459 @@ -2768,7 +2768,7 @@ static bool api_lsa_EnumAccountsWithUser
3460
3461         r->out.result = _lsa_EnumAccountsWithUserRight(p, r);
3462
3463 -       if (p->rng_fault_state) {
3464 +       if (p->fault_state) {
3465                 talloc_free(r);
3466                 /* Return true here, srv_pipe_hnd.c will take care */
3467                 return true;
3468 @@ -2848,7 +2848,7 @@ static bool api_lsa_EnumAccountRights(st
3469
3470         r->out.result = _lsa_EnumAccountRights(p, r);
3471
3472 -       if (p->rng_fault_state) {
3473 +       if (p->fault_state) {
3474                 talloc_free(r);
3475                 /* Return true here, srv_pipe_hnd.c will take care */
3476                 return true;
3477 @@ -2921,7 +2921,7 @@ static bool api_lsa_AddAccountRights(str
3478
3479         r->out.result = _lsa_AddAccountRights(p, r);
3480
3481 -       if (p->rng_fault_state) {
3482 +       if (p->fault_state) {
3483                 talloc_free(r);
3484                 /* Return true here, srv_pipe_hnd.c will take care */
3485                 return true;
3486 @@ -2994,7 +2994,7 @@ static bool api_lsa_RemoveAccountRights(
3487
3488         r->out.result = _lsa_RemoveAccountRights(p, r);
3489
3490 -       if (p->rng_fault_state) {
3491 +       if (p->fault_state) {
3492                 talloc_free(r);
3493                 /* Return true here, srv_pipe_hnd.c will take care */
3494                 return true;
3495 @@ -3074,7 +3074,7 @@ static bool api_lsa_QueryTrustedDomainIn
3496
3497         r->out.result = _lsa_QueryTrustedDomainInfoBySid(p, r);
3498
3499 -       if (p->rng_fault_state) {
3500 +       if (p->fault_state) {
3501                 talloc_free(r);
3502                 /* Return true here, srv_pipe_hnd.c will take care */
3503                 return true;
3504 @@ -3147,7 +3147,7 @@ static bool api_lsa_SetTrustedDomainInfo
3505
3506         r->out.result = _lsa_SetTrustedDomainInfo(p, r);
3507
3508 -       if (p->rng_fault_state) {
3509 +       if (p->fault_state) {
3510                 talloc_free(r);
3511                 /* Return true here, srv_pipe_hnd.c will take care */
3512                 return true;
3513 @@ -3220,7 +3220,7 @@ static bool api_lsa_DeleteTrustedDomain(
3514
3515         r->out.result = _lsa_DeleteTrustedDomain(p, r);
3516
3517 -       if (p->rng_fault_state) {
3518 +       if (p->fault_state) {
3519                 talloc_free(r);
3520                 /* Return true here, srv_pipe_hnd.c will take care */
3521                 return true;
3522 @@ -3293,7 +3293,7 @@ static bool api_lsa_StorePrivateData(str
3523
3524         r->out.result = _lsa_StorePrivateData(p, r);
3525
3526 -       if (p->rng_fault_state) {
3527 +       if (p->fault_state) {
3528                 talloc_free(r);
3529                 /* Return true here, srv_pipe_hnd.c will take care */
3530                 return true;
3531 @@ -3368,7 +3368,7 @@ static bool api_lsa_RetrievePrivateData(
3532         r->out.val = r->in.val;
3533         r->out.result = _lsa_RetrievePrivateData(p, r);
3534
3535 -       if (p->rng_fault_state) {
3536 +       if (p->fault_state) {
3537                 talloc_free(r);
3538                 /* Return true here, srv_pipe_hnd.c will take care */
3539                 return true;
3540 @@ -3448,7 +3448,7 @@ static bool api_lsa_OpenPolicy2(struct p
3541
3542         r->out.result = _lsa_OpenPolicy2(p, r);
3543
3544 -       if (p->rng_fault_state) {
3545 +       if (p->fault_state) {
3546                 talloc_free(r);
3547                 /* Return true here, srv_pipe_hnd.c will take care */
3548                 return true;
3549 @@ -3524,7 +3524,7 @@ static bool api_lsa_GetUserName(struct p
3550         r->out.authority_name = r->in.authority_name;
3551         r->out.result = _lsa_GetUserName(p, r);
3552
3553 -       if (p->rng_fault_state) {
3554 +       if (p->fault_state) {
3555                 talloc_free(r);
3556                 /* Return true here, srv_pipe_hnd.c will take care */
3557                 return true;
3558 @@ -3604,7 +3604,7 @@ static bool api_lsa_QueryInfoPolicy2(str
3559
3560         r->out.result = _lsa_QueryInfoPolicy2(p, r);
3561
3562 -       if (p->rng_fault_state) {
3563 +       if (p->fault_state) {
3564                 talloc_free(r);
3565                 /* Return true here, srv_pipe_hnd.c will take care */
3566                 return true;
3567 @@ -3677,7 +3677,7 @@ static bool api_lsa_SetInfoPolicy2(struc
3568
3569         r->out.result = _lsa_SetInfoPolicy2(p, r);
3570
3571 -       if (p->rng_fault_state) {
3572 +       if (p->fault_state) {
3573                 talloc_free(r);
3574                 /* Return true here, srv_pipe_hnd.c will take care */
3575                 return true;
3576 @@ -3757,7 +3757,7 @@ static bool api_lsa_QueryTrustedDomainIn
3577
3578         r->out.result = _lsa_QueryTrustedDomainInfoByName(p, r);
3579
3580 -       if (p->rng_fault_state) {
3581 +       if (p->fault_state) {
3582                 talloc_free(r);
3583                 /* Return true here, srv_pipe_hnd.c will take care */
3584                 return true;
3585 @@ -3830,7 +3830,7 @@ static bool api_lsa_SetTrustedDomainInfo
3586
3587         r->out.result = _lsa_SetTrustedDomainInfoByName(p, r);
3588
3589 -       if (p->rng_fault_state) {
3590 +       if (p->fault_state) {
3591                 talloc_free(r);
3592                 /* Return true here, srv_pipe_hnd.c will take care */
3593                 return true;
3594 @@ -3911,7 +3911,7 @@ static bool api_lsa_EnumTrustedDomainsEx
3595
3596         r->out.result = _lsa_EnumTrustedDomainsEx(p, r);
3597
3598 -       if (p->rng_fault_state) {
3599 +       if (p->fault_state) {
3600                 talloc_free(r);
3601                 /* Return true here, srv_pipe_hnd.c will take care */
3602                 return true;
3603 @@ -3991,7 +3991,7 @@ static bool api_lsa_CreateTrustedDomainE
3604
3605         r->out.result = _lsa_CreateTrustedDomainEx(p, r);
3606
3607 -       if (p->rng_fault_state) {
3608 +       if (p->fault_state) {
3609                 talloc_free(r);
3610                 /* Return true here, srv_pipe_hnd.c will take care */
3611                 return true;
3612 @@ -4066,7 +4066,7 @@ static bool api_lsa_CloseTrustedDomainEx
3613         r->out.handle = r->in.handle;
3614         r->out.result = _lsa_CloseTrustedDomainEx(p, r);
3615
3616 -       if (p->rng_fault_state) {
3617 +       if (p->fault_state) {
3618                 talloc_free(r);
3619                 /* Return true here, srv_pipe_hnd.c will take care */
3620                 return true;
3621 @@ -4146,7 +4146,7 @@ static bool api_lsa_QueryDomainInformati
3622
3623         r->out.result = _lsa_QueryDomainInformationPolicy(p, r);
3624
3625 -       if (p->rng_fault_state) {
3626 +       if (p->fault_state) {
3627                 talloc_free(r);
3628                 /* Return true here, srv_pipe_hnd.c will take care */
3629                 return true;
3630 @@ -4219,7 +4219,7 @@ static bool api_lsa_SetDomainInformation
3631
3632         r->out.result = _lsa_SetDomainInformationPolicy(p, r);
3633
3634 -       if (p->rng_fault_state) {
3635 +       if (p->fault_state) {
3636                 talloc_free(r);
3637                 /* Return true here, srv_pipe_hnd.c will take care */
3638                 return true;
3639 @@ -4299,7 +4299,7 @@ static bool api_lsa_OpenTrustedDomainByN
3640
3641         r->out.result = _lsa_OpenTrustedDomainByName(p, r);
3642
3643 -       if (p->rng_fault_state) {
3644 +       if (p->fault_state) {
3645                 talloc_free(r);
3646                 /* Return true here, srv_pipe_hnd.c will take care */
3647                 return true;
3648 @@ -4372,7 +4372,7 @@ static bool api_lsa_TestCall(struct pipe
3649
3650         r->out.result = _lsa_TestCall(p, r);
3651
3652 -       if (p->rng_fault_state) {
3653 +       if (p->fault_state) {
3654                 talloc_free(r);
3655                 /* Return true here, srv_pipe_hnd.c will take care */
3656                 return true;
3657 @@ -4454,7 +4454,7 @@ static bool api_lsa_LookupSids2(struct p
3658
3659         r->out.result = _lsa_LookupSids2(p, r);
3660
3661 -       if (p->rng_fault_state) {
3662 +       if (p->fault_state) {
3663                 talloc_free(r);
3664                 /* Return true here, srv_pipe_hnd.c will take care */
3665                 return true;
3666 @@ -4536,7 +4536,7 @@ static bool api_lsa_LookupNames2(struct
3667
3668         r->out.result = _lsa_LookupNames2(p, r);
3669
3670 -       if (p->rng_fault_state) {
3671 +       if (p->fault_state) {
3672                 talloc_free(r);
3673                 /* Return true here, srv_pipe_hnd.c will take care */
3674                 return true;
3675 @@ -4616,7 +4616,7 @@ static bool api_lsa_CreateTrustedDomainE
3676
3677         r->out.result = _lsa_CreateTrustedDomainEx2(p, r);
3678
3679 -       if (p->rng_fault_state) {
3680 +       if (p->fault_state) {
3681                 talloc_free(r);
3682                 /* Return true here, srv_pipe_hnd.c will take care */
3683                 return true;
3684 @@ -4689,7 +4689,7 @@ static bool api_lsa_CREDRWRITE(struct pi
3685
3686         r->out.result = _lsa_CREDRWRITE(p, r);
3687
3688 -       if (p->rng_fault_state) {
3689 +       if (p->fault_state) {
3690                 talloc_free(r);
3691                 /* Return true here, srv_pipe_hnd.c will take care */
3692                 return true;
3693 @@ -4762,7 +4762,7 @@ static bool api_lsa_CREDRREAD(struct pip
3694
3695         r->out.result = _lsa_CREDRREAD(p, r);
3696
3697 -       if (p->rng_fault_state) {
3698 +       if (p->fault_state) {
3699                 talloc_free(r);
3700                 /* Return true here, srv_pipe_hnd.c will take care */
3701                 return true;
3702 @@ -4835,7 +4835,7 @@ static bool api_lsa_CREDRENUMERATE(struc
3703
3704         r->out.result = _lsa_CREDRENUMERATE(p, r);
3705
3706 -       if (p->rng_fault_state) {
3707 +       if (p->fault_state) {
3708                 talloc_free(r);
3709                 /* Return true here, srv_pipe_hnd.c will take care */
3710                 return true;
3711 @@ -4908,7 +4908,7 @@ static bool api_lsa_CREDRWRITEDOMAINCRED
3712
3713         r->out.result = _lsa_CREDRWRITEDOMAINCREDENTIALS(p, r);
3714
3715 -       if (p->rng_fault_state) {
3716 +       if (p->fault_state) {
3717                 talloc_free(r);
3718                 /* Return true here, srv_pipe_hnd.c will take care */
3719                 return true;
3720 @@ -4981,7 +4981,7 @@ static bool api_lsa_CREDRREADDOMAINCREDE
3721
3722         r->out.result = _lsa_CREDRREADDOMAINCREDENTIALS(p, r);
3723
3724 -       if (p->rng_fault_state) {
3725 +       if (p->fault_state) {
3726                 talloc_free(r);
3727                 /* Return true here, srv_pipe_hnd.c will take care */
3728                 return true;
3729 @@ -5054,7 +5054,7 @@ static bool api_lsa_CREDRDELETE(struct p
3730
3731         r->out.result = _lsa_CREDRDELETE(p, r);
3732
3733 -       if (p->rng_fault_state) {
3734 +       if (p->fault_state) {
3735                 talloc_free(r);
3736                 /* Return true here, srv_pipe_hnd.c will take care */
3737                 return true;
3738 @@ -5127,7 +5127,7 @@ static bool api_lsa_CREDRGETTARGETINFO(s
3739
3740         r->out.result = _lsa_CREDRGETTARGETINFO(p, r);
3741
3742 -       if (p->rng_fault_state) {
3743 +       if (p->fault_state) {
3744                 talloc_free(r);
3745                 /* Return true here, srv_pipe_hnd.c will take care */
3746                 return true;
3747 @@ -5200,7 +5200,7 @@ static bool api_lsa_CREDRPROFILELOADED(s
3748
3749         r->out.result = _lsa_CREDRPROFILELOADED(p, r);
3750
3751 -       if (p->rng_fault_state) {
3752 +       if (p->fault_state) {
3753                 talloc_free(r);
3754                 /* Return true here, srv_pipe_hnd.c will take care */
3755                 return true;
3756 @@ -5282,7 +5282,7 @@ static bool api_lsa_LookupNames3(struct
3757
3758         r->out.result = _lsa_LookupNames3(p, r);
3759
3760 -       if (p->rng_fault_state) {
3761 +       if (p->fault_state) {
3762                 talloc_free(r);
3763                 /* Return true here, srv_pipe_hnd.c will take care */
3764                 return true;
3765 @@ -5355,7 +5355,7 @@ static bool api_lsa_CREDRGETSESSIONTYPES
3766
3767         r->out.result = _lsa_CREDRGETSESSIONTYPES(p, r);
3768
3769 -       if (p->rng_fault_state) {
3770 +       if (p->fault_state) {
3771                 talloc_free(r);
3772                 /* Return true here, srv_pipe_hnd.c will take care */
3773                 return true;
3774 @@ -5428,7 +5428,7 @@ static bool api_lsa_LSARREGISTERAUDITEVE
3775
3776         r->out.result = _lsa_LSARREGISTERAUDITEVENT(p, r);
3777
3778 -       if (p->rng_fault_state) {
3779 +       if (p->fault_state) {
3780                 talloc_free(r);
3781                 /* Return true here, srv_pipe_hnd.c will take care */
3782                 return true;
3783 @@ -5501,7 +5501,7 @@ static bool api_lsa_LSARGENAUDITEVENT(st
3784
3785         r->out.result = _lsa_LSARGENAUDITEVENT(p, r);
3786
3787 -       if (p->rng_fault_state) {
3788 +       if (p->fault_state) {
3789                 talloc_free(r);
3790                 /* Return true here, srv_pipe_hnd.c will take care */
3791                 return true;
3792 @@ -5574,7 +5574,7 @@ static bool api_lsa_LSARUNREGISTERAUDITE
3793
3794         r->out.result = _lsa_LSARUNREGISTERAUDITEVENT(p, r);
3795
3796 -       if (p->rng_fault_state) {
3797 +       if (p->fault_state) {
3798                 talloc_free(r);
3799                 /* Return true here, srv_pipe_hnd.c will take care */
3800                 return true;
3801 @@ -5654,7 +5654,7 @@ static bool api_lsa_lsaRQueryForestTrust
3802
3803         r->out.result = _lsa_lsaRQueryForestTrustInformation(p, r);
3804
3805 -       if (p->rng_fault_state) {
3806 +       if (p->fault_state) {
3807                 talloc_free(r);
3808                 /* Return true here, srv_pipe_hnd.c will take care */
3809                 return true;
3810 @@ -5734,7 +5734,7 @@ static bool api_lsa_lsaRSetForestTrustIn
3811
3812         r->out.result = _lsa_lsaRSetForestTrustInformation(p, r);
3813
3814 -       if (p->rng_fault_state) {
3815 +       if (p->fault_state) {
3816                 talloc_free(r);
3817                 /* Return true here, srv_pipe_hnd.c will take care */
3818                 return true;
3819 @@ -5807,7 +5807,7 @@ static bool api_lsa_CREDRRENAME(struct p
3820
3821         r->out.result = _lsa_CREDRRENAME(p, r);
3822
3823 -       if (p->rng_fault_state) {
3824 +       if (p->fault_state) {
3825                 talloc_free(r);
3826                 /* Return true here, srv_pipe_hnd.c will take care */
3827                 return true;
3828 @@ -5889,7 +5889,7 @@ static bool api_lsa_LookupSids3(struct p
3829
3830         r->out.result = _lsa_LookupSids3(p, r);
3831
3832 -       if (p->rng_fault_state) {
3833 +       if (p->fault_state) {
3834                 talloc_free(r);
3835                 /* Return true here, srv_pipe_hnd.c will take care */
3836                 return true;
3837 @@ -5971,7 +5971,7 @@ static bool api_lsa_LookupNames4(struct
3838
3839         r->out.result = _lsa_LookupNames4(p, r);
3840
3841 -       if (p->rng_fault_state) {
3842 +       if (p->fault_state) {
3843                 talloc_free(r);
3844                 /* Return true here, srv_pipe_hnd.c will take care */
3845                 return true;
3846 @@ -6044,7 +6044,7 @@ static bool api_lsa_LSAROPENPOLICYSCE(st
3847
3848         r->out.result = _lsa_LSAROPENPOLICYSCE(p, r);
3849
3850 -       if (p->rng_fault_state) {
3851 +       if (p->fault_state) {
3852                 talloc_free(r);
3853                 /* Return true here, srv_pipe_hnd.c will take care */
3854                 return true;
3855 @@ -6117,7 +6117,7 @@ static bool api_lsa_LSARADTREGISTERSECUR
3856
3857         r->out.result = _lsa_LSARADTREGISTERSECURITYEVENTSOURCE(p, r);
3858
3859 -       if (p->rng_fault_state) {
3860 +       if (p->fault_state) {
3861                 talloc_free(r);
3862                 /* Return true here, srv_pipe_hnd.c will take care */
3863                 return true;
3864 @@ -6190,7 +6190,7 @@ static bool api_lsa_LSARADTUNREGISTERSEC
3865
3866         r->out.result = _lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(p, r);
3867
3868 -       if (p->rng_fault_state) {
3869 +       if (p->fault_state) {
3870                 talloc_free(r);
3871                 /* Return true here, srv_pipe_hnd.c will take care */
3872                 return true;
3873 @@ -6263,7 +6263,7 @@ static bool api_lsa_LSARADTREPORTSECURIT
3874
3875         r->out.result = _lsa_LSARADTREPORTSECURITYEVENT(p, r);
3876
3877 -       if (p->rng_fault_state) {
3878 +       if (p->fault_state) {
3879                 talloc_free(r);
3880                 /* Return true here, srv_pipe_hnd.c will take care */
3881                 return true;
3882 --- a/source3/librpc/gen_ndr/srv_mgmt.c
3883 +++ b/source3/librpc/gen_ndr/srv_mgmt.c
3884 @@ -51,7 +51,7 @@ static bool api_mgmt_inq_if_ids(struct p
3885
3886         r->out.result = _mgmt_inq_if_ids(p, r);
3887
3888 -       if (p->rng_fault_state) {
3889 +       if (p->fault_state) {
3890                 talloc_free(r);
3891                 /* Return true here, srv_pipe_hnd.c will take care */
3892                 return true;
3893 @@ -131,7 +131,7 @@ static bool api_mgmt_inq_stats(struct pi
3894
3895         r->out.result = _mgmt_inq_stats(p, r);
3896
3897 -       if (p->rng_fault_state) {
3898 +       if (p->fault_state) {
3899                 talloc_free(r);
3900                 /* Return true here, srv_pipe_hnd.c will take care */
3901                 return true;
3902 @@ -211,7 +211,7 @@ static bool api_mgmt_is_server_listening
3903
3904         r->out.result = _mgmt_is_server_listening(p, r);
3905
3906 -       if (p->rng_fault_state) {
3907 +       if (p->fault_state) {
3908                 talloc_free(r);
3909                 /* Return true here, srv_pipe_hnd.c will take care */
3910                 return true;
3911 @@ -284,7 +284,7 @@ static bool api_mgmt_stop_server_listeni
3912
3913         r->out.result = _mgmt_stop_server_listening(p, r);
3914
3915 -       if (p->rng_fault_state) {
3916 +       if (p->fault_state) {
3917                 talloc_free(r);
3918                 /* Return true here, srv_pipe_hnd.c will take care */
3919                 return true;
3920 @@ -364,7 +364,7 @@ static bool api_mgmt_inq_princ_name(stru
3921
3922         r->out.result = _mgmt_inq_princ_name(p, r);
3923
3924 -       if (p->rng_fault_state) {
3925 +       if (p->fault_state) {
3926                 talloc_free(r);
3927                 /* Return true here, srv_pipe_hnd.c will take care */
3928                 return true;
3929 --- a/source3/librpc/gen_ndr/srv_msgsvc.c
3930 +++ b/source3/librpc/gen_ndr/srv_msgsvc.c
3931 @@ -44,7 +44,7 @@ static bool api_NetrMessageNameAdd(struc
3932
3933         _NetrMessageNameAdd(p, r);
3934
3935 -       if (p->rng_fault_state) {
3936 +       if (p->fault_state) {
3937                 talloc_free(r);
3938                 /* Return true here, srv_pipe_hnd.c will take care */
3939                 return true;
3940 @@ -117,7 +117,7 @@ static bool api_NetrMessageNameEnum(stru
3941
3942         _NetrMessageNameEnum(p, r);
3943
3944 -       if (p->rng_fault_state) {
3945 +       if (p->fault_state) {
3946                 talloc_free(r);
3947                 /* Return true here, srv_pipe_hnd.c will take care */
3948                 return true;
3949 @@ -190,7 +190,7 @@ static bool api_NetrMessageNameGetInfo(s
3950
3951         _NetrMessageNameGetInfo(p, r);
3952
3953 -       if (p->rng_fault_state) {
3954 +       if (p->fault_state) {
3955                 talloc_free(r);
3956                 /* Return true here, srv_pipe_hnd.c will take care */
3957                 return true;
3958 @@ -263,7 +263,7 @@ static bool api_NetrMessageNameDel(struc
3959
3960         _NetrMessageNameDel(p, r);
3961
3962 -       if (p->rng_fault_state) {
3963 +       if (p->fault_state) {
3964                 talloc_free(r);
3965                 /* Return true here, srv_pipe_hnd.c will take care */
3966                 return true;
3967 @@ -361,7 +361,7 @@ static bool api_NetrSendMessage(struct p
3968
3969         _NetrSendMessage(p, r);
3970
3971 -       if (p->rng_fault_state) {
3972 +       if (p->fault_state) {
3973                 talloc_free(r);
3974                 /* Return true here, srv_pipe_hnd.c will take care */
3975                 return true;
3976 --- a/source3/librpc/gen_ndr/srv_nbt.c
3977 +++ b/source3/librpc/gen_ndr/srv_nbt.c
3978 @@ -44,7 +44,7 @@ static bool api_decode_nbt_netlogon_pack
3979
3980         _decode_nbt_netlogon_packet(p, r);
3981
3982 -       if (p->rng_fault_state) {
3983 +       if (p->fault_state) {
3984                 talloc_free(r);
3985                 /* Return true here, srv_pipe_hnd.c will take care */
3986                 return true;
3987 --- a/source3/librpc/gen_ndr/srv_netlogon.c
3988 +++ b/source3/librpc/gen_ndr/srv_netlogon.c
3989 @@ -51,7 +51,7 @@ static bool api_netr_LogonUasLogon(struc
3990
3991         r->out.result = _netr_LogonUasLogon(p, r);
3992
3993 -       if (p->rng_fault_state) {
3994 +       if (p->fault_state) {
3995                 talloc_free(r);
3996                 /* Return true here, srv_pipe_hnd.c will take care */
3997                 return true;
3998 @@ -131,7 +131,7 @@ static bool api_netr_LogonUasLogoff(stru
3999
4000         r->out.result = _netr_LogonUasLogoff(p, r);
4001
4002 -       if (p->rng_fault_state) {
4003 +       if (p->fault_state) {
4004                 talloc_free(r);
4005                 /* Return true here, srv_pipe_hnd.c will take care */
4006                 return true;
4007 @@ -218,7 +218,7 @@ static bool api_netr_LogonSamLogon(struc
4008
4009         r->out.result = _netr_LogonSamLogon(p, r);
4010
4011 -       if (p->rng_fault_state) {
4012 +       if (p->fault_state) {
4013                 talloc_free(r);
4014                 /* Return true here, srv_pipe_hnd.c will take care */
4015                 return true;
4016 @@ -293,7 +293,7 @@ static bool api_netr_LogonSamLogoff(stru
4017         r->out.return_authenticator = r->in.return_authenticator;
4018         r->out.result = _netr_LogonSamLogoff(p, r);
4019
4020 -       if (p->rng_fault_state) {
4021 +       if (p->fault_state) {
4022                 talloc_free(r);
4023                 /* Return true here, srv_pipe_hnd.c will take care */
4024                 return true;
4025 @@ -373,7 +373,7 @@ static bool api_netr_ServerReqChallenge(
4026
4027         r->out.result = _netr_ServerReqChallenge(p, r);
4028
4029 -       if (p->rng_fault_state) {
4030 +       if (p->fault_state) {
4031                 talloc_free(r);
4032                 /* Return true here, srv_pipe_hnd.c will take care */
4033                 return true;
4034 @@ -453,7 +453,7 @@ static bool api_netr_ServerAuthenticate(
4035
4036         r->out.result = _netr_ServerAuthenticate(p, r);
4037
4038 -       if (p->rng_fault_state) {
4039 +       if (p->fault_state) {
4040                 talloc_free(r);
4041                 /* Return true here, srv_pipe_hnd.c will take care */
4042                 return true;
4043 @@ -533,7 +533,7 @@ static bool api_netr_ServerPasswordSet(s
4044
4045         r->out.result = _netr_ServerPasswordSet(p, r);
4046
4047 -       if (p->rng_fault_state) {
4048 +       if (p->fault_state) {
4049                 talloc_free(r);
4050                 /* Return true here, srv_pipe_hnd.c will take care */
4051                 return true;
4052 @@ -615,7 +615,7 @@ static bool api_netr_DatabaseDeltas(stru
4053
4054         r->out.result = _netr_DatabaseDeltas(p, r);
4055
4056 -       if (p->rng_fault_state) {
4057 +       if (p->fault_state) {
4058                 talloc_free(r);
4059                 /* Return true here, srv_pipe_hnd.c will take care */
4060                 return true;
4061 @@ -697,7 +697,7 @@ static bool api_netr_DatabaseSync(struct
4062
4063         r->out.result = _netr_DatabaseSync(p, r);
4064
4065 -       if (p->rng_fault_state) {
4066 +       if (p->fault_state) {
4067                 talloc_free(r);
4068                 /* Return true here, srv_pipe_hnd.c will take care */
4069                 return true;
4070 @@ -796,7 +796,7 @@ static bool api_netr_AccountDeltas(struc
4071
4072         r->out.result = _netr_AccountDeltas(p, r);
4073
4074 -       if (p->rng_fault_state) {
4075 +       if (p->fault_state) {
4076                 talloc_free(r);
4077                 /* Return true here, srv_pipe_hnd.c will take care */
4078                 return true;
4079 @@ -896,7 +896,7 @@ static bool api_netr_AccountSync(struct
4080
4081         r->out.result = _netr_AccountSync(p, r);
4082
4083 -       if (p->rng_fault_state) {
4084 +       if (p->fault_state) {
4085                 talloc_free(r);
4086                 /* Return true here, srv_pipe_hnd.c will take care */
4087                 return true;
4088 @@ -976,7 +976,7 @@ static bool api_netr_GetDcName(struct pi
4089
4090         r->out.result = _netr_GetDcName(p, r);
4091
4092 -       if (p->rng_fault_state) {
4093 +       if (p->fault_state) {
4094                 talloc_free(r);
4095                 /* Return true here, srv_pipe_hnd.c will take care */
4096                 return true;
4097 @@ -1056,7 +1056,7 @@ static bool api_netr_LogonControl(struct
4098
4099         r->out.result = _netr_LogonControl(p, r);
4100
4101 -       if (p->rng_fault_state) {
4102 +       if (p->fault_state) {
4103                 talloc_free(r);
4104                 /* Return true here, srv_pipe_hnd.c will take care */
4105                 return true;
4106 @@ -1136,7 +1136,7 @@ static bool api_netr_GetAnyDCName(struct
4107
4108         r->out.result = _netr_GetAnyDCName(p, r);
4109
4110 -       if (p->rng_fault_state) {
4111 +       if (p->fault_state) {
4112                 talloc_free(r);
4113                 /* Return true here, srv_pipe_hnd.c will take care */
4114                 return true;
4115 @@ -1216,7 +1216,7 @@ static bool api_netr_LogonControl2(struc
4116
4117         r->out.result = _netr_LogonControl2(p, r);
4118
4119 -       if (p->rng_fault_state) {
4120 +       if (p->fault_state) {
4121                 talloc_free(r);
4122                 /* Return true here, srv_pipe_hnd.c will take care */
4123                 return true;
4124 @@ -1297,7 +1297,7 @@ static bool api_netr_ServerAuthenticate2
4125
4126         r->out.result = _netr_ServerAuthenticate2(p, r);
4127
4128 -       if (p->rng_fault_state) {
4129 +       if (p->fault_state) {
4130                 talloc_free(r);
4131                 /* Return true here, srv_pipe_hnd.c will take care */
4132                 return true;
4133 @@ -1379,7 +1379,7 @@ static bool api_netr_DatabaseSync2(struc
4134
4135         r->out.result = _netr_DatabaseSync2(p, r);
4136
4137 -       if (p->rng_fault_state) {
4138 +       if (p->fault_state) {
4139                 talloc_free(r);
4140                 /* Return true here, srv_pipe_hnd.c will take care */
4141                 return true;
4142 @@ -1460,7 +1460,7 @@ static bool api_netr_DatabaseRedo(struct
4143
4144         r->out.result = _netr_DatabaseRedo(p, r);
4145
4146 -       if (p->rng_fault_state) {
4147 +       if (p->fault_state) {
4148                 talloc_free(r);
4149                 /* Return true here, srv_pipe_hnd.c will take care */
4150                 return true;
4151 @@ -1540,7 +1540,7 @@ static bool api_netr_LogonControl2Ex(str
4152
4153         r->out.result = _netr_LogonControl2Ex(p, r);
4154
4155 -       if (p->rng_fault_state) {
4156 +       if (p->fault_state) {
4157                 talloc_free(r);
4158                 /* Return true here, srv_pipe_hnd.c will take care */
4159                 return true;
4160 @@ -1620,7 +1620,7 @@ static bool api_netr_NetrEnumerateTruste
4161
4162         r->out.result = _netr_NetrEnumerateTrustedDomains(p, r);
4163
4164 -       if (p->rng_fault_state) {
4165 +       if (p->fault_state) {
4166                 talloc_free(r);
4167                 /* Return true here, srv_pipe_hnd.c will take care */
4168                 return true;
4169 @@ -1700,7 +1700,7 @@ static bool api_netr_DsRGetDCName(struct
4170
4171         r->out.result = _netr_DsRGetDCName(p, r);
4172
4173 -       if (p->rng_fault_state) {
4174 +       if (p->fault_state) {
4175                 talloc_free(r);
4176                 /* Return true here, srv_pipe_hnd.c will take care */
4177                 return true;
4178 @@ -1781,7 +1781,7 @@ static bool api_netr_LogonGetCapabilitie
4179
4180         r->out.result = _netr_LogonGetCapabilities(p, r);
4181
4182 -       if (p->rng_fault_state) {
4183 +       if (p->fault_state) {
4184                 talloc_free(r);
4185                 /* Return true here, srv_pipe_hnd.c will take care */
4186                 return true;
4187 @@ -1854,7 +1854,7 @@ static bool api_netr_NETRLOGONSETSERVICE
4188
4189         r->out.result = _netr_NETRLOGONSETSERVICEBITS(p, r);
4190
4191 -       if (p->rng_fault_state) {
4192 +       if (p->fault_state) {
4193                 talloc_free(r);
4194                 /* Return true here, srv_pipe_hnd.c will take care */
4195                 return true;
4196 @@ -1934,7 +1934,7 @@ static bool api_netr_LogonGetTrustRid(st
4197
4198         r->out.result = _netr_LogonGetTrustRid(p, r);
4199
4200 -       if (p->rng_fault_state) {
4201 +       if (p->fault_state) {
4202                 talloc_free(r);
4203                 /* Return true here, srv_pipe_hnd.c will take care */
4204                 return true;
4205 @@ -2007,7 +2007,7 @@ static bool api_netr_NETRLOGONCOMPUTESER
4206
4207         r->out.result = _netr_NETRLOGONCOMPUTESERVERDIGEST(p, r);
4208
4209 -       if (p->rng_fault_state) {
4210 +       if (p->fault_state) {
4211                 talloc_free(r);
4212                 /* Return true here, srv_pipe_hnd.c will take care */
4213                 return true;
4214 @@ -2080,7 +2080,7 @@ static bool api_netr_NETRLOGONCOMPUTECLI
4215
4216         r->out.result = _netr_NETRLOGONCOMPUTECLIENTDIGEST(p, r);
4217
4218 -       if (p->rng_fault_state) {
4219 +       if (p->fault_state) {
4220                 talloc_free(r);
4221                 /* Return true here, srv_pipe_hnd.c will take care */
4222                 return true;
4223 @@ -2167,7 +2167,7 @@ static bool api_netr_ServerAuthenticate3
4224
4225         r->out.result = _netr_ServerAuthenticate3(p, r);
4226
4227 -       if (p->rng_fault_state) {
4228 +       if (p->fault_state) {
4229                 talloc_free(r);
4230                 /* Return true here, srv_pipe_hnd.c will take care */
4231                 return true;
4232 @@ -2247,7 +2247,7 @@ static bool api_netr_DsRGetDCNameEx(stru
4233
4234         r->out.result = _netr_DsRGetDCNameEx(p, r);
4235
4236 -       if (p->rng_fault_state) {
4237 +       if (p->fault_state) {
4238                 talloc_free(r);
4239                 /* Return true here, srv_pipe_hnd.c will take care */
4240                 return true;
4241 @@ -2327,7 +2327,7 @@ static bool api_netr_DsRGetSiteName(stru
4242
4243         r->out.result = _netr_DsRGetSiteName(p, r);
4244
4245 -       if (p->rng_fault_state) {
4246 +       if (p->fault_state) {
4247                 talloc_free(r);
4248                 /* Return true here, srv_pipe_hnd.c will take care */
4249                 return true;
4250 @@ -2408,7 +2408,7 @@ static bool api_netr_LogonGetDomainInfo(
4251
4252         r->out.result = _netr_LogonGetDomainInfo(p, r);
4253
4254 -       if (p->rng_fault_state) {
4255 +       if (p->fault_state) {
4256                 talloc_free(r);
4257                 /* Return true here, srv_pipe_hnd.c will take care */
4258                 return true;
4259 @@ -2488,7 +2488,7 @@ static bool api_netr_ServerPasswordSet2(
4260
4261         r->out.result = _netr_ServerPasswordSet2(p, r);
4262
4263 -       if (p->rng_fault_state) {
4264 +       if (p->fault_state) {
4265                 talloc_free(r);
4266                 /* Return true here, srv_pipe_hnd.c will take care */
4267                 return true;
4268 @@ -2574,7 +2574,7 @@ static bool api_netr_ServerPasswordGet(s
4269
4270         r->out.result = _netr_ServerPasswordGet(p, r);
4271
4272 -       if (p->rng_fault_state) {
4273 +       if (p->fault_state) {
4274                 talloc_free(r);
4275                 /* Return true here, srv_pipe_hnd.c will take care */
4276                 return true;
4277 @@ -2647,7 +2647,7 @@ static bool api_netr_NETRLOGONSENDTOSAM(
4278
4279         r->out.result = _netr_NETRLOGONSENDTOSAM(p, r);
4280
4281 -       if (p->rng_fault_state) {
4282 +       if (p->fault_state) {
4283                 talloc_free(r);
4284                 /* Return true here, srv_pipe_hnd.c will take care */
4285                 return true;
4286 @@ -2727,7 +2727,7 @@ static bool api_netr_DsRAddressToSitenam
4287
4288         r->out.result = _netr_DsRAddressToSitenamesW(p, r);
4289
4290 -       if (p->rng_fault_state) {
4291 +       if (p->fault_state) {
4292                 talloc_free(r);
4293                 /* Return true here, srv_pipe_hnd.c will take care */
4294                 return true;
4295 @@ -2807,7 +2807,7 @@ static bool api_netr_DsRGetDCNameEx2(str
4296
4297         r->out.result = _netr_DsRGetDCNameEx2(p, r);
4298
4299 -       if (p->rng_fault_state) {
4300 +       if (p->fault_state) {
4301                 talloc_free(r);
4302                 /* Return true here, srv_pipe_hnd.c will take care */
4303                 return true;
4304 @@ -2880,7 +2880,7 @@ static bool api_netr_NETRLOGONGETTIMESER
4305
4306         r->out.result = _netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(p, r);
4307
4308 -       if (p->rng_fault_state) {
4309 +       if (p->fault_state) {
4310                 talloc_free(r);
4311                 /* Return true here, srv_pipe_hnd.c will take care */
4312                 return true;
4313 @@ -2960,7 +2960,7 @@ static bool api_netr_NetrEnumerateTruste
4314
4315         r->out.result = _netr_NetrEnumerateTrustedDomainsEx(p, r);
4316
4317 -       if (p->rng_fault_state) {
4318 +       if (p->fault_state) {
4319                 talloc_free(r);
4320                 /* Return true here, srv_pipe_hnd.c will take care */
4321                 return true;
4322 @@ -3040,7 +3040,7 @@ static bool api_netr_DsRAddressToSitenam
4323
4324         r->out.result = _netr_DsRAddressToSitenamesExW(p, r);
4325
4326 -       if (p->rng_fault_state) {
4327 +       if (p->fault_state) {
4328                 talloc_free(r);
4329                 /* Return true here, srv_pipe_hnd.c will take care */
4330                 return true;
4331 @@ -3120,7 +3120,7 @@ static bool api_netr_DsrGetDcSiteCoverag
4332
4333         r->out.result = _netr_DsrGetDcSiteCoverageW(p, r);
4334
4335 -       if (p->rng_fault_state) {
4336 +       if (p->fault_state) {
4337                 talloc_free(r);
4338                 /* Return true here, srv_pipe_hnd.c will take care */
4339                 return true;
4340 @@ -3207,7 +3207,7 @@ static bool api_netr_LogonSamLogonEx(str
4341
4342         r->out.result = _netr_LogonSamLogonEx(p, r);
4343
4344 -       if (p->rng_fault_state) {
4345 +       if (p->fault_state) {
4346                 talloc_free(r);
4347                 /* Return true here, srv_pipe_hnd.c will take care */
4348                 return true;
4349 @@ -3287,7 +3287,7 @@ static bool api_netr_DsrEnumerateDomainT
4350
4351         r->out.result = _netr_DsrEnumerateDomainTrusts(p, r);
4352
4353 -       if (p->rng_fault_state) {
4354 +       if (p->fault_state) {
4355                 talloc_free(r);
4356                 /* Return true here, srv_pipe_hnd.c will take care */
4357                 return true;
4358 @@ -3360,7 +3360,7 @@ static bool api_netr_DsrDeregisterDNSHos
4359
4360         r->out.result = _netr_DsrDeregisterDNSHostRecords(p, r);
4361
4362 -       if (p->rng_fault_state) {
4363 +       if (p->fault_state) {
4364                 talloc_free(r);
4365                 /* Return true here, srv_pipe_hnd.c will take care */
4366                 return true;
4367 @@ -3452,7 +3452,7 @@ static bool api_netr_ServerTrustPassword
4368
4369         r->out.result = _netr_ServerTrustPasswordsGet(p, r);
4370
4371 -       if (p->rng_fault_state) {
4372 +       if (p->fault_state) {
4373                 talloc_free(r);
4374                 /* Return true here, srv_pipe_hnd.c will take care */
4375                 return true;
4376 @@ -3532,7 +3532,7 @@ static bool api_netr_DsRGetForestTrustIn
4377
4378         r->out.result = _netr_DsRGetForestTrustInformation(p, r);
4379
4380 -       if (p->rng_fault_state) {
4381 +       if (p->fault_state) {
4382                 talloc_free(r);
4383                 /* Return true here, srv_pipe_hnd.c will take care */
4384                 return true;
4385 @@ -3618,7 +3618,7 @@ static bool api_netr_GetForestTrustInfor
4386
4387         r->out.result = _netr_GetForestTrustInformation(p, r);
4388
4389 -       if (p->rng_fault_state) {
4390 +       if (p->fault_state) {
4391                 talloc_free(r);
4392                 /* Return true here, srv_pipe_hnd.c will take care */
4393                 return true;
4394 @@ -3706,7 +3706,7 @@ static bool api_netr_LogonSamLogonWithFl
4395
4396         r->out.result = _netr_LogonSamLogonWithFlags(p, r);
4397
4398 -       if (p->rng_fault_state) {
4399 +       if (p->fault_state) {
4400                 talloc_free(r);
4401                 /* Return true here, srv_pipe_hnd.c will take care */
4402                 return true;
4403 @@ -3804,7 +3804,7 @@ static bool api_netr_ServerGetTrustInfo(
4404
4405         r->out.result = _netr_ServerGetTrustInfo(p, r);
4406
4407 -       if (p->rng_fault_state) {
4408 +       if (p->fault_state) {
4409                 talloc_free(r);
4410                 /* Return true here, srv_pipe_hnd.c will take care */
4411                 return true;
4412 @@ -3877,7 +3877,7 @@ static bool api_netr_Unused47(struct pip
4413
4414         r->out.result = _netr_Unused47(p, r);
4415
4416 -       if (p->rng_fault_state) {
4417 +       if (p->fault_state) {
4418                 talloc_free(r);
4419                 /* Return true here, srv_pipe_hnd.c will take care */
4420                 return true;
4421 @@ -3958,7 +3958,7 @@ static bool api_netr_DsrUpdateReadOnlySe
4422
4423         r->out.result = _netr_DsrUpdateReadOnlyServerDnsRecords(p, r);
4424
4425 -       if (p->rng_fault_state) {
4426 +       if (p->fault_state) {
4427                 talloc_free(r);
4428                 /* Return true here, srv_pipe_hnd.c will take care */
4429                 return true;
4430 --- a/source3/librpc/gen_ndr/srv_ntlmssp.c
4431 +++ b/source3/librpc/gen_ndr/srv_ntlmssp.c
4432 @@ -44,7 +44,7 @@ static bool api_decode_NEGOTIATE_MESSAGE
4433
4434         _decode_NEGOTIATE_MESSAGE(p, r);
4435
4436 -       if (p->rng_fault_state) {
4437 +       if (p->fault_state) {
4438                 talloc_free(r);
4439                 /* Return true here, srv_pipe_hnd.c will take care */
4440                 return true;
4441 @@ -117,7 +117,7 @@ static bool api_decode_CHALLENGE_MESSAGE
4442
4443         _decode_CHALLENGE_MESSAGE(p, r);
4444
4445 -       if (p->rng_fault_state) {
4446 +       if (p->fault_state) {
4447                 talloc_free(r);
4448                 /* Return true here, srv_pipe_hnd.c will take care */
4449                 return true;
4450 @@ -190,7 +190,7 @@ static bool api_decode_AUTHENTICATE_MESS
4451
4452         _decode_AUTHENTICATE_MESSAGE(p, r);
4453
4454 -       if (p->rng_fault_state) {
4455 +       if (p->fault_state) {
4456                 talloc_free(r);
4457                 /* Return true here, srv_pipe_hnd.c will take care */
4458                 return true;
4459 @@ -263,7 +263,7 @@ static bool api_decode_NTLMv2_CLIENT_CHA
4460
4461         _decode_NTLMv2_CLIENT_CHALLENGE(p, r);
4462
4463 -       if (p->rng_fault_state) {
4464 +       if (p->fault_state) {
4465                 talloc_free(r);
4466                 /* Return true here, srv_pipe_hnd.c will take care */
4467                 return true;
4468 @@ -336,7 +336,7 @@ static bool api_decode_NTLMv2_RESPONSE(s
4469
4470         _decode_NTLMv2_RESPONSE(p, r);
4471
4472 -       if (p->rng_fault_state) {
4473 +       if (p->fault_state) {
4474                 talloc_free(r);
4475                 /* Return true here, srv_pipe_hnd.c will take care */
4476                 return true;
4477 --- a/source3/librpc/gen_ndr/srv_ntprinting.c
4478 +++ b/source3/librpc/gen_ndr/srv_ntprinting.c
4479 @@ -44,7 +44,7 @@ static bool api_decode_ntprinting_form(s
4480
4481         _decode_ntprinting_form(p, r);
4482
4483 -       if (p->rng_fault_state) {
4484 +       if (p->fault_state) {
4485                 talloc_free(r);
4486                 /* Return true here, srv_pipe_hnd.c will take care */
4487                 return true;
4488 @@ -117,7 +117,7 @@ static bool api_decode_ntprinting_driver
4489
4490         _decode_ntprinting_driver(p, r);
4491
4492 -       if (p->rng_fault_state) {
4493 +       if (p->fault_state) {
4494                 talloc_free(r);
4495                 /* Return true here, srv_pipe_hnd.c will take care */
4496                 return true;
4497 @@ -190,7 +190,7 @@ static bool api_decode_ntprinting_printe
4498
4499         _decode_ntprinting_printer(p, r);
4500
4501 -       if (p->rng_fault_state) {
4502 +       if (p->fault_state) {
4503                 talloc_free(r);
4504                 /* Return true here, srv_pipe_hnd.c will take care */
4505                 return true;
4506 --- a/source3/librpc/gen_ndr/srv_ntsvcs.c
4507 +++ b/source3/librpc/gen_ndr/srv_ntsvcs.c
4508 @@ -44,7 +44,7 @@ static bool api_PNP_Disconnect(struct pi
4509
4510         r->out.result = _PNP_Disconnect(p, r);
4511
4512 -       if (p->rng_fault_state) {
4513 +       if (p->fault_state) {
4514                 talloc_free(r);
4515                 /* Return true here, srv_pipe_hnd.c will take care */
4516                 return true;
4517 @@ -117,7 +117,7 @@ static bool api_PNP_Connect(struct pipes
4518
4519         r->out.result = _PNP_Connect(p, r);
4520
4521 -       if (p->rng_fault_state) {
4522 +       if (p->fault_state) {
4523                 talloc_free(r);
4524                 /* Return true here, srv_pipe_hnd.c will take care */
4525                 return true;
4526 @@ -197,7 +197,7 @@ static bool api_PNP_GetVersion(struct pi
4527
4528         r->out.result = _PNP_GetVersion(p, r);
4529
4530 -       if (p->rng_fault_state) {
4531 +       if (p->fault_state) {
4532                 talloc_free(r);
4533                 /* Return true here, srv_pipe_hnd.c will take care */
4534                 return true;
4535 @@ -270,7 +270,7 @@ static bool api_PNP_GetGlobalState(struc
4536
4537         r->out.result = _PNP_GetGlobalState(p, r);
4538
4539 -       if (p->rng_fault_state) {
4540 +       if (p->fault_state) {
4541                 talloc_free(r);
4542                 /* Return true here, srv_pipe_hnd.c will take care */
4543                 return true;
4544 @@ -343,7 +343,7 @@ static bool api_PNP_InitDetection(struct
4545
4546         r->out.result = _PNP_InitDetection(p, r);
4547
4548 -       if (p->rng_fault_state) {
4549 +       if (p->fault_state) {
4550                 talloc_free(r);
4551                 /* Return true here, srv_pipe_hnd.c will take care */
4552                 return true;
4553 @@ -416,7 +416,7 @@ static bool api_PNP_ReportLogOn(struct p
4554
4555         r->out.result = _PNP_ReportLogOn(p, r);
4556
4557 -       if (p->rng_fault_state) {
4558 +       if (p->fault_state) {
4559                 talloc_free(r);
4560                 /* Return true here, srv_pipe_hnd.c will take care */
4561                 return true;
4562 @@ -489,7 +489,7 @@ static bool api_PNP_ValidateDeviceInstan
4563
4564         r->out.result = _PNP_ValidateDeviceInstance(p, r);
4565
4566 -       if (p->rng_fault_state) {
4567 +       if (p->fault_state) {
4568                 talloc_free(r);
4569                 /* Return true here, srv_pipe_hnd.c will take care */
4570                 return true;
4571 @@ -562,7 +562,7 @@ static bool api_PNP_GetRootDeviceInstanc
4572
4573         r->out.result = _PNP_GetRootDeviceInstance(p, r);
4574
4575 -       if (p->rng_fault_state) {
4576 +       if (p->fault_state) {
4577                 talloc_free(r);
4578                 /* Return true here, srv_pipe_hnd.c will take care */
4579                 return true;
4580 @@ -635,7 +635,7 @@ static bool api_PNP_GetRelatedDeviceInst
4581
4582         r->out.result = _PNP_GetRelatedDeviceInstance(p, r);
4583
4584 -       if (p->rng_fault_state) {
4585 +       if (p->fault_state) {
4586                 talloc_free(r);
4587                 /* Return true here, srv_pipe_hnd.c will take care */
4588                 return true;
4589 @@ -708,7 +708,7 @@ static bool api_PNP_EnumerateSubKeys(str
4590
4591         r->out.result = _PNP_EnumerateSubKeys(p, r);
4592
4593 -       if (p->rng_fault_state) {
4594 +       if (p->fault_state) {
4595                 talloc_free(r);
4596                 /* Return true here, srv_pipe_hnd.c will take care */
4597                 return true;
4598 @@ -789,7 +789,7 @@ static bool api_PNP_GetDeviceList(struct
4599
4600         r->out.result = _PNP_GetDeviceList(p, r);
4601
4602 -       if (p->rng_fault_state) {
4603 +       if (p->fault_state) {
4604                 talloc_free(r);
4605                 /* Return true here, srv_pipe_hnd.c will take care */
4606                 return true;
4607 @@ -869,7 +869,7 @@ static bool api_PNP_GetDeviceListSize(st
4608
4609         r->out.result = _PNP_GetDeviceListSize(p, r);
4610
4611 -       if (p->rng_fault_state) {
4612 +       if (p->fault_state) {
4613                 talloc_free(r);
4614                 /* Return true here, srv_pipe_hnd.c will take care */
4615                 return true;
4616 @@ -942,7 +942,7 @@ static bool api_PNP_GetDepth(struct pipe
4617
4618         r->out.result = _PNP_GetDepth(p, r);
4619
4620 -       if (p->rng_fault_state) {
4621 +       if (p->fault_state) {
4622                 talloc_free(r);
4623                 /* Return true here, srv_pipe_hnd.c will take care */
4624                 return true;
4625 @@ -1025,7 +1025,7 @@ static bool api_PNP_GetDeviceRegProp(str
4626
4627         r->out.result = _PNP_GetDeviceRegProp(p, r);
4628
4629 -       if (p->rng_fault_state) {
4630 +       if (p->fault_state) {
4631                 talloc_free(r);
4632                 /* Return true here, srv_pipe_hnd.c will take care */
4633                 return true;
4634 @@ -1098,7 +1098,7 @@ static bool api_PNP_SetDeviceRegProp(str
4635
4636         r->out.result = _PNP_SetDeviceRegProp(p, r);
4637
4638 -       if (p->rng_fault_state) {
4639 +       if (p->fault_state) {
4640                 talloc_free(r);
4641                 /* Return true here, srv_pipe_hnd.c will take care */
4642                 return true;
4643 @@ -1171,7 +1171,7 @@ static bool api_PNP_GetClassInstance(str
4644
4645         r->out.result = _PNP_GetClassInstance(p, r);
4646
4647 -       if (p->rng_fault_state) {
4648 +       if (p->fault_state) {
4649                 talloc_free(r);
4650                 /* Return true here, srv_pipe_hnd.c will take care */
4651                 return true;
4652 @@ -1244,7 +1244,7 @@ static bool api_PNP_CreateKey(struct pip
4653
4654         r->out.result = _PNP_CreateKey(p, r);
4655
4656 -       if (p->rng_fault_state) {
4657 +       if (p->fault_state) {
4658                 talloc_free(r);
4659                 /* Return true here, srv_pipe_hnd.c will take care */
4660                 return true;
4661 @@ -1317,7 +1317,7 @@ static bool api_PNP_DeleteRegistryKey(st
4662
4663         r->out.result = _PNP_DeleteRegistryKey(p, r);
4664
4665 -       if (p->rng_fault_state) {
4666 +       if (p->fault_state) {
4667                 talloc_free(r);
4668                 /* Return true here, srv_pipe_hnd.c will take care */
4669                 return true;
4670 @@ -1390,7 +1390,7 @@ static bool api_PNP_GetClassCount(struct
4671
4672         r->out.result = _PNP_GetClassCount(p, r);
4673
4674 -       if (p->rng_fault_state) {
4675 +       if (p->fault_state) {
4676                 talloc_free(r);
4677                 /* Return true here, srv_pipe_hnd.c will take care */
4678                 return true;
4679 @@ -1463,7 +1463,7 @@ static bool api_PNP_GetClassName(struct
4680
4681         r->out.result = _PNP_GetClassName(p, r);
4682
4683 -       if (p->rng_fault_state) {
4684 +       if (p->fault_state) {
4685                 talloc_free(r);
4686                 /* Return true here, srv_pipe_hnd.c will take care */
4687                 return true;
4688 @@ -1536,7 +1536,7 @@ static bool api_PNP_DeleteClassKey(struc
4689
4690         r->out.result = _PNP_DeleteClassKey(p, r);
4691
4692 -       if (p->rng_fault_state) {
4693 +       if (p->fault_state) {
4694                 talloc_free(r);
4695                 /* Return true here, srv_pipe_hnd.c will take care */
4696                 return true;
4697 @@ -1609,7 +1609,7 @@ static bool api_PNP_GetInterfaceDeviceAl
4698
4699         r->out.result = _PNP_GetInterfaceDeviceAlias(p, r);
4700
4701 -       if (p->rng_fault_state) {
4702 +       if (p->fault_state) {
4703                 talloc_free(r);
4704                 /* Return true here, srv_pipe_hnd.c will take care */
4705                 return true;
4706 @@ -1682,7 +1682,7 @@ static bool api_PNP_GetInterfaceDeviceLi
4707
4708         r->out.result = _PNP_GetInterfaceDeviceList(p, r);
4709
4710 -       if (p->rng_fault_state) {
4711 +       if (p->fault_state) {
4712                 talloc_free(r);
4713                 /* Return true here, srv_pipe_hnd.c will take care */
4714                 return true;
4715 @@ -1755,7 +1755,7 @@ static bool api_PNP_GetInterfaceDeviceLi
4716
4717         r->out.result = _PNP_GetInterfaceDeviceListSize(p, r);
4718
4719 -       if (p->rng_fault_state) {
4720 +       if (p->fault_state) {
4721                 talloc_free(r);
4722                 /* Return true here, srv_pipe_hnd.c will take care */
4723                 return true;
4724 @@ -1828,7 +1828,7 @@ static bool api_PNP_RegisterDeviceClassA
4725
4726         r->out.result = _PNP_RegisterDeviceClassAssociation(p, r);
4727
4728 -       if (p->rng_fault_state) {
4729 +       if (p->fault_state) {
4730                 talloc_free(r);
4731                 /* Return true here, srv_pipe_hnd.c will take care */
4732                 return true;
4733 @@ -1901,7 +1901,7 @@ static bool api_PNP_UnregisterDeviceClas
4734
4735         r->out.result = _PNP_UnregisterDeviceClassAssociation(p, r);
4736
4737 -       if (p->rng_fault_state) {
4738 +       if (p->fault_state) {
4739                 talloc_free(r);
4740                 /* Return true here, srv_pipe_hnd.c will take care */
4741                 return true;
4742 @@ -1974,7 +1974,7 @@ static bool api_PNP_GetClassRegProp(stru
4743
4744         r->out.result = _PNP_GetClassRegProp(p, r);
4745
4746 -       if (p->rng_fault_state) {
4747 +       if (p->fault_state) {
4748                 talloc_free(r);
4749                 /* Return true here, srv_pipe_hnd.c will take care */
4750                 return true;
4751 @@ -2047,7 +2047,7 @@ static bool api_PNP_SetClassRegProp(stru
4752
4753         r->out.result = _PNP_SetClassRegProp(p, r);
4754
4755 -       if (p->rng_fault_state) {
4756 +       if (p->fault_state) {
4757                 talloc_free(r);
4758                 /* Return true here, srv_pipe_hnd.c will take care */
4759                 return true;
4760 @@ -2120,7 +2120,7 @@ static bool api_PNP_CreateDevInst(struct
4761
4762         r->out.result = _PNP_CreateDevInst(p, r);
4763
4764 -       if (p->rng_fault_state) {
4765 +       if (p->fault_state) {
4766                 talloc_free(r);
4767                 /* Return true here, srv_pipe_hnd.c will take care */
4768                 return true;
4769 @@ -2193,7 +2193,7 @@ static bool api_PNP_DeviceInstanceAction
4770
4771         r->out.result = _PNP_DeviceInstanceAction(p, r);
4772
4773 -       if (p->rng_fault_state) {
4774 +       if (p->fault_state) {
4775                 talloc_free(r);
4776                 /* Return true here, srv_pipe_hnd.c will take care */
4777                 return true;
4778 @@ -2266,7 +2266,7 @@ static bool api_PNP_GetDeviceStatus(stru
4779
4780         r->out.result = _PNP_GetDeviceStatus(p, r);
4781
4782 -       if (p->rng_fault_state) {
4783 +       if (p->fault_state) {
4784                 talloc_free(r);
4785                 /* Return true here, srv_pipe_hnd.c will take care */
4786                 return true;
4787 @@ -2339,7 +2339,7 @@ static bool api_PNP_SetDeviceProblem(str
4788
4789         r->out.result = _PNP_SetDeviceProblem(p, r);
4790
4791 -       if (p->rng_fault_state) {
4792 +       if (p->fault_state) {
4793                 talloc_free(r);
4794                 /* Return true here, srv_pipe_hnd.c will take care */
4795                 return true;
4796 @@ -2412,7 +2412,7 @@ static bool api_PNP_DisableDevInst(struc
4797
4798         r->out.result = _PNP_DisableDevInst(p, r);
4799
4800 -       if (p->rng_fault_state) {
4801 +       if (p->fault_state) {
4802                 talloc_free(r);
4803                 /* Return true here, srv_pipe_hnd.c will take care */
4804                 return true;
4805 @@ -2485,7 +2485,7 @@ static bool api_PNP_UninstallDevInst(str
4806
4807         r->out.result = _PNP_UninstallDevInst(p, r);
4808
4809 -       if (p->rng_fault_state) {
4810 +       if (p->fault_state) {
4811                 talloc_free(r);
4812                 /* Return true here, srv_pipe_hnd.c will take care */
4813                 return true;
4814 @@ -2558,7 +2558,7 @@ static bool api_PNP_AddID(struct pipes_s
4815
4816         r->out.result = _PNP_AddID(p, r);
4817
4818 -       if (p->rng_fault_state) {
4819 +       if (p->fault_state) {
4820                 talloc_free(r);
4821                 /* Return true here, srv_pipe_hnd.c will take care */
4822                 return true;
4823 @@ -2631,7 +2631,7 @@ static bool api_PNP_RegisterDriver(struc
4824
4825         r->out.result = _PNP_RegisterDriver(p, r);
4826
4827 -       if (p->rng_fault_state) {
4828 +       if (p->fault_state) {
4829                 talloc_free(r);
4830                 /* Return true here, srv_pipe_hnd.c will take care */
4831                 return true;
4832 @@ -2704,7 +2704,7 @@ static bool api_PNP_QueryRemove(struct p
4833
4834         r->out.result = _PNP_QueryRemove(p, r);
4835
4836 -       if (p->rng_fault_state) {
4837 +       if (p->fault_state) {
4838                 talloc_free(r);
4839                 /* Return true here, srv_pipe_hnd.c will take care */
4840                 return true;
4841 @@ -2777,7 +2777,7 @@ static bool api_PNP_RequestDeviceEject(s
4842
4843         r->out.result = _PNP_RequestDeviceEject(p, r);
4844
4845 -       if (p->rng_fault_state) {
4846 +       if (p->fault_state) {
4847                 talloc_free(r);
4848                 /* Return true here, srv_pipe_hnd.c will take care */
4849                 return true;
4850 @@ -2850,7 +2850,7 @@ static bool api_PNP_IsDockStationPresent
4851
4852         r->out.result = _PNP_IsDockStationPresent(p, r);
4853
4854 -       if (p->rng_fault_state) {
4855 +       if (p->fault_state) {
4856                 talloc_free(r);
4857                 /* Return true here, srv_pipe_hnd.c will take care */
4858                 return true;
4859 @@ -2923,7 +2923,7 @@ static bool api_PNP_RequestEjectPC(struc
4860
4861         r->out.result = _PNP_RequestEjectPC(p, r);
4862
4863 -       if (p->rng_fault_state) {
4864 +       if (p->fault_state) {
4865                 talloc_free(r);
4866                 /* Return true here, srv_pipe_hnd.c will take care */
4867                 return true;
4868 @@ -3005,7 +3005,7 @@ static bool api_PNP_HwProfFlags(struct p
4869
4870         r->out.result = _PNP_HwProfFlags(p, r);
4871
4872 -       if (p->rng_fault_state) {
4873 +       if (p->fault_state) {
4874                 talloc_free(r);
4875                 /* Return true here, srv_pipe_hnd.c will take care */
4876                 return true;
4877 @@ -3080,7 +3080,7 @@ static bool api_PNP_GetHwProfInfo(struct
4878         r->out.info = r->in.info;
4879         r->out.result = _PNP_GetHwProfInfo(p, r);
4880
4881 -       if (p->rng_fault_state) {
4882 +       if (p->fault_state) {
4883                 talloc_free(r);
4884                 /* Return true here, srv_pipe_hnd.c will take care */
4885                 return true;
4886 @@ -3153,7 +3153,7 @@ static bool api_PNP_AddEmptyLogConf(stru
4887
4888         r->out.result = _PNP_AddEmptyLogConf(p, r);
4889
4890 -       if (p->rng_fault_state) {
4891 +       if (p->fault_state) {
4892                 talloc_free(r);
4893                 /* Return true here, srv_pipe_hnd.c will take care */
4894                 return true;
4895 @@ -3226,7 +3226,7 @@ static bool api_PNP_FreeLogConf(struct p
4896
4897         r->out.result = _PNP_FreeLogConf(p, r);
4898
4899 -       if (p->rng_fault_state) {
4900 +       if (p->fault_state) {
4901                 talloc_free(r);
4902                 /* Return true here, srv_pipe_hnd.c will take care */
4903                 return true;
4904 @@ -3299,7 +3299,7 @@ static bool api_PNP_GetFirstLogConf(stru
4905
4906         r->out.result = _PNP_GetFirstLogConf(p, r);
4907
4908 -       if (p->rng_fault_state) {
4909 +       if (p->fault_state) {
4910                 talloc_free(r);
4911                 /* Return true here, srv_pipe_hnd.c will take care */
4912                 return true;
4913 @@ -3372,7 +3372,7 @@ static bool api_PNP_GetNextLogConf(struc
4914
4915         r->out.result = _PNP_GetNextLogConf(p, r);
4916
4917 -       if (p->rng_fault_state) {
4918 +       if (p->fault_state) {
4919                 talloc_free(r);
4920                 /* Return true here, srv_pipe_hnd.c will take care */
4921                 return true;
4922 @@ -3445,7 +3445,7 @@ static bool api_PNP_GetLogConfPriority(s
4923
4924         r->out.result = _PNP_GetLogConfPriority(p, r);
4925
4926 -       if (p->rng_fault_state) {
4927 +       if (p->fault_state) {
4928                 talloc_free(r);
4929                 /* Return true here, srv_pipe_hnd.c will take care */
4930                 return true;
4931 @@ -3518,7 +3518,7 @@ static bool api_PNP_AddResDes(struct pip
4932
4933         r->out.result = _PNP_AddResDes(p, r);
4934
4935 -       if (p->rng_fault_state) {
4936 +       if (p->fault_state) {
4937                 talloc_free(r);
4938                 /* Return true here, srv_pipe_hnd.c will take care */
4939                 return true;
4940 @@ -3591,7 +3591,7 @@ static bool api_PNP_FreeResDes(struct pi
4941
4942         r->out.result = _PNP_FreeResDes(p, r);
4943
4944 -       if (p->rng_fault_state) {
4945 +       if (p->fault_state) {
4946                 talloc_free(r);
4947                 /* Return true here, srv_pipe_hnd.c will take care */
4948                 return true;
4949 @@ -3664,7 +3664,7 @@ static bool api_PNP_GetNextResDes(struct
4950
4951         r->out.result = _PNP_GetNextResDes(p, r);
4952
4953 -       if (p->rng_fault_state) {
4954 +       if (p->fault_state) {
4955                 talloc_free(r);
4956                 /* Return true here, srv_pipe_hnd.c will take care */
4957                 return true;
4958 @@ -3737,7 +3737,7 @@ static bool api_PNP_GetResDesData(struct
4959
4960         r->out.result = _PNP_GetResDesData(p, r);
4961
4962 -       if (p->rng_fault_state) {
4963 +       if (p->fault_state) {
4964                 talloc_free(r);
4965                 /* Return true here, srv_pipe_hnd.c will take care */
4966                 return true;
4967 @@ -3810,7 +3810,7 @@ static bool api_PNP_GetResDesDataSize(st
4968
4969         r->out.result = _PNP_GetResDesDataSize(p, r);
4970
4971 -       if (p->rng_fault_state) {
4972 +       if (p->fault_state) {
4973                 talloc_free(r);
4974                 /* Return true here, srv_pipe_hnd.c will take care */
4975                 return true;
4976 @@ -3883,7 +3883,7 @@ static bool api_PNP_ModifyResDes(struct
4977
4978         r->out.result = _PNP_ModifyResDes(p, r);
4979
4980 -       if (p->rng_fault_state) {
4981 +       if (p->fault_state) {
4982                 talloc_free(r);
4983                 /* Return true here, srv_pipe_hnd.c will take care */
4984                 return true;
4985 @@ -3956,7 +3956,7 @@ static bool api_PNP_DetectResourceLimit(
4986
4987         r->out.result = _PNP_DetectResourceLimit(p, r);
4988
4989 -       if (p->rng_fault_state) {
4990 +       if (p->fault_state) {
4991                 talloc_free(r);
4992                 /* Return true here, srv_pipe_hnd.c will take care */
4993                 return true;
4994 @@ -4029,7 +4029,7 @@ static bool api_PNP_QueryResConfList(str
4995
4996         r->out.result = _PNP_QueryResConfList(p, r);
4997
4998 -       if (p->rng_fault_state) {
4999 +       if (p->fault_state) {
5000                 talloc_free(r);
5001                 /* Return true here, srv_pipe_hnd.c will take care */
5002                 return true;
5003 @@ -4102,7 +4102,7 @@ static bool api_PNP_SetHwProf(struct pip
5004
5005         r->out.result = _PNP_SetHwProf(p, r);
5006
5007 -       if (p->rng_fault_state) {
5008 +       if (p->fault_state) {
5009                 talloc_free(r);
5010                 /* Return true here, srv_pipe_hnd.c will take care */
5011                 return true;
5012 @@ -4175,7 +4175,7 @@ static bool api_PNP_QueryArbitratorFreeD
5013
5014         r->out.result = _PNP_QueryArbitratorFreeData(p, r);
5015
5016 -       if (p->rng_fault_state) {
5017 +       if (p->fault_state) {
5018                 talloc_free(r);
5019                 /* Return true here, srv_pipe_hnd.c will take care */
5020                 return true;
5021 @@ -4248,7 +4248,7 @@ static bool api_PNP_QueryArbitratorFreeS
5022
5023         r->out.result = _PNP_QueryArbitratorFreeSize(p, r);
5024
5025 -       if (p->rng_fault_state) {
5026 +       if (p->fault_state) {
5027                 talloc_free(r);
5028                 /* Return true here, srv_pipe_hnd.c will take care */
5029                 return true;
5030 @@ -4321,7 +4321,7 @@ static bool api_PNP_RunDetection(struct
5031
5032         r->out.result = _PNP_RunDetection(p, r);
5033
5034 -       if (p->rng_fault_state) {
5035 +       if (p->fault_state) {
5036                 talloc_free(r);
5037                 /* Return true here, srv_pipe_hnd.c will take care */
5038                 return true;
5039 @@ -4394,7 +4394,7 @@ static bool api_PNP_RegisterNotification
5040
5041         r->out.result = _PNP_RegisterNotification(p, r);
5042
5043 -       if (p->rng_fault_state) {
5044 +       if (p->fault_state) {
5045                 talloc_free(r);
5046                 /* Return true here, srv_pipe_hnd.c will take care */
5047                 return true;
5048 @@ -4467,7 +4467,7 @@ static bool api_PNP_UnregisterNotificati
5049
5050         r->out.result = _PNP_UnregisterNotification(p, r);
5051
5052 -       if (p->rng_fault_state) {
5053 +       if (p->fault_state) {
5054                 talloc_free(r);
5055                 /* Return true here, srv_pipe_hnd.c will take care */
5056                 return true;
5057 @@ -4540,7 +4540,7 @@ static bool api_PNP_GetCustomDevProp(str
5058
5059         r->out.result = _PNP_GetCustomDevProp(p, r);
5060
5061 -       if (p->rng_fault_state) {
5062 +       if (p->fault_state) {
5063                 talloc_free(r);
5064                 /* Return true here, srv_pipe_hnd.c will take care */
5065                 return true;
5066 @@ -4613,7 +4613,7 @@ static bool api_PNP_GetVersionInternal(s
5067
5068         r->out.result = _PNP_GetVersionInternal(p, r);
5069
5070 -       if (p->rng_fault_state) {
5071 +       if (p->fault_state) {
5072                 talloc_free(r);
5073                 /* Return true here, srv_pipe_hnd.c will take care */
5074                 return true;
5075 @@ -4686,7 +4686,7 @@ static bool api_PNP_GetBlockedDriverInfo
5076
5077         r->out.result = _PNP_GetBlockedDriverInfo(p, r);
5078
5079 -       if (p->rng_fault_state) {
5080 +       if (p->fault_state) {
5081                 talloc_free(r);
5082                 /* Return true here, srv_pipe_hnd.c will take care */
5083                 return true;
5084 @@ -4759,7 +4759,7 @@ static bool api_PNP_GetServerSideDeviceI
5085
5086         r->out.result = _PNP_GetServerSideDeviceInstallFlags(p, r);
5087
5088 -       if (p->rng_fault_state) {
5089 +       if (p->fault_state) {
5090                 talloc_free(r);
5091                 /* Return true here, srv_pipe_hnd.c will take care */
5092                 return true;
5093 --- a/source3/librpc/gen_ndr/srv_oxidresolver.c
5094 +++ b/source3/librpc/gen_ndr/srv_oxidresolver.c
5095 @@ -63,7 +63,7 @@ static bool api_ResolveOxid(struct pipes
5096
5097         r->out.result = _ResolveOxid(p, r);
5098
5099 -       if (p->rng_fault_state) {
5100 +       if (p->fault_state) {
5101                 talloc_free(r);
5102                 /* Return true here, srv_pipe_hnd.c will take care */
5103                 return true;
5104 @@ -136,7 +136,7 @@ static bool api_SimplePing(struct pipes_
5105
5106         r->out.result = _SimplePing(p, r);
5107
5108 -       if (p->rng_fault_state) {
5109 +       if (p->fault_state) {
5110                 talloc_free(r);
5111                 /* Return true here, srv_pipe_hnd.c will take care */
5112                 return true;
5113 @@ -217,7 +217,7 @@ static bool api_ComplexPing(struct pipes
5114
5115         r->out.result = _ComplexPing(p, r);
5116
5117 -       if (p->rng_fault_state) {
5118 +       if (p->fault_state) {
5119                 talloc_free(r);
5120                 /* Return true here, srv_pipe_hnd.c will take care */
5121                 return true;
5122 @@ -290,7 +290,7 @@ static bool api_ServerAlive(struct pipes
5123
5124         r->out.result = _ServerAlive(p, r);
5125
5126 -       if (p->rng_fault_state) {
5127 +       if (p->fault_state) {
5128                 talloc_free(r);
5129                 /* Return true here, srv_pipe_hnd.c will take care */
5130                 return true;
5131 @@ -388,7 +388,7 @@ static bool api_ResolveOxid2(struct pipe
5132
5133         r->out.result = _ResolveOxid2(p, r);
5134
5135 -       if (p->rng_fault_state) {
5136 +       if (p->fault_state) {
5137                 talloc_free(r);
5138                 /* Return true here, srv_pipe_hnd.c will take care */
5139                 return true;
5140 @@ -492,7 +492,7 @@ static bool api_ServerAlive2(struct pipe
5141
5142         r->out.result = _ServerAlive2(p, r);
5143
5144 -       if (p->rng_fault_state) {
5145 +       if (p->fault_state) {
5146                 talloc_free(r);
5147                 /* Return true here, srv_pipe_hnd.c will take care */
5148                 return true;
5149 --- a/source3/librpc/gen_ndr/srv_policyagent.c
5150 +++ b/source3/librpc/gen_ndr/srv_policyagent.c
5151 @@ -44,7 +44,7 @@ static bool api_policyagent_Dummy(struct
5152
5153         r->out.result = _policyagent_Dummy(p, r);
5154
5155 -       if (p->rng_fault_state) {
5156 +       if (p->fault_state) {
5157                 talloc_free(r);
5158                 /* Return true here, srv_pipe_hnd.c will take care */
5159                 return true;
5160 --- a/source3/librpc/gen_ndr/srv_preg.c
5161 +++ b/source3/librpc/gen_ndr/srv_preg.c
5162 @@ -44,7 +44,7 @@ static bool api_decode_preg_file(struct
5163
5164         _decode_preg_file(p, r);
5165
5166 -       if (p->rng_fault_state) {
5167 +       if (p->fault_state) {
5168                 talloc_free(r);
5169                 /* Return true here, srv_pipe_hnd.c will take care */
5170                 return true;
5171 --- a/source3/librpc/gen_ndr/srv_rap.c
5172 +++ b/source3/librpc/gen_ndr/srv_rap.c
5173 @@ -51,7 +51,7 @@ static bool api_rap_NetShareEnum(struct
5174
5175         _rap_NetShareEnum(p, r);
5176
5177 -       if (p->rng_fault_state) {
5178 +       if (p->fault_state) {
5179                 talloc_free(r);
5180                 /* Return true here, srv_pipe_hnd.c will take care */
5181                 return true;
5182 @@ -125,7 +125,7 @@ static bool api_rap_NetShareAdd(struct p
5183         ZERO_STRUCT(r->out);
5184         _rap_NetShareAdd(p, r);
5185
5186 -       if (p->rng_fault_state) {
5187 +       if (p->fault_state) {
5188                 talloc_free(r);
5189                 /* Return true here, srv_pipe_hnd.c will take care */
5190                 return true;
5191 @@ -205,7 +205,7 @@ static bool api_rap_NetServerEnum2(struc
5192
5193         _rap_NetServerEnum2(p, r);
5194
5195 -       if (p->rng_fault_state) {
5196 +       if (p->fault_state) {
5197                 talloc_free(r);
5198                 /* Return true here, srv_pipe_hnd.c will take care */
5199                 return true;
5200 @@ -279,7 +279,7 @@ static bool api_rap_WserverGetInfo(struc
5201         ZERO_STRUCT(r->out);
5202         _rap_WserverGetInfo(p, r);
5203
5204 -       if (p->rng_fault_state) {
5205 +       if (p->fault_state) {
5206                 talloc_free(r);
5207                 /* Return true here, srv_pipe_hnd.c will take care */
5208                 return true;
5209 @@ -359,7 +359,7 @@ static bool api_rap_NetPrintQEnum(struct
5210
5211         _rap_NetPrintQEnum(p, r);
5212
5213 -       if (p->rng_fault_state) {
5214 +       if (p->fault_state) {
5215                 talloc_free(r);
5216                 /* Return true here, srv_pipe_hnd.c will take care */
5217                 return true;
5218 @@ -433,7 +433,7 @@ static bool api_rap_NetPrintQGetInfo(str
5219         ZERO_STRUCT(r->out);
5220         _rap_NetPrintQGetInfo(p, r);
5221
5222 -       if (p->rng_fault_state) {
5223 +       if (p->fault_state) {
5224                 talloc_free(r);
5225                 /* Return true here, srv_pipe_hnd.c will take care */
5226                 return true;
5227 @@ -507,7 +507,7 @@ static bool api_rap_NetPrintJobPause(str
5228         ZERO_STRUCT(r->out);
5229         _rap_NetPrintJobPause(p, r);
5230
5231 -       if (p->rng_fault_state) {
5232 +       if (p->fault_state) {
5233                 talloc_free(r);
5234                 /* Return true here, srv_pipe_hnd.c will take care */
5235                 return true;
5236 @@ -581,7 +581,7 @@ static bool api_rap_NetPrintJobContinue(
5237         ZERO_STRUCT(r->out);
5238         _rap_NetPrintJobContinue(p, r);
5239
5240 -       if (p->rng_fault_state) {
5241 +       if (p->fault_state) {
5242                 talloc_free(r);
5243                 /* Return true here, srv_pipe_hnd.c will take care */
5244                 return true;
5245 @@ -655,7 +655,7 @@ static bool api_rap_NetPrintJobDelete(st
5246         ZERO_STRUCT(r->out);
5247         _rap_NetPrintJobDelete(p, r);
5248
5249 -       if (p->rng_fault_state) {
5250 +       if (p->fault_state) {
5251                 talloc_free(r);
5252                 /* Return true here, srv_pipe_hnd.c will take care */
5253                 return true;
5254 @@ -729,7 +729,7 @@ static bool api_rap_NetPrintQueuePause(s
5255         ZERO_STRUCT(r->out);
5256         _rap_NetPrintQueuePause(p, r);
5257
5258 -       if (p->rng_fault_state) {
5259 +       if (p->fault_state) {
5260                 talloc_free(r);
5261                 /* Return true here, srv_pipe_hnd.c will take care */
5262                 return true;
5263 @@ -803,7 +803,7 @@ static bool api_rap_NetPrintQueueResume(
5264         ZERO_STRUCT(r->out);
5265         _rap_NetPrintQueueResume(p, r);
5266
5267 -       if (p->rng_fault_state) {
5268 +       if (p->fault_state) {
5269                 talloc_free(r);
5270                 /* Return true here, srv_pipe_hnd.c will take care */
5271                 return true;
5272 @@ -877,7 +877,7 @@ static bool api_rap_NetPrintQueuePurge(s
5273         ZERO_STRUCT(r->out);
5274         _rap_NetPrintQueuePurge(p, r);
5275
5276 -       if (p->rng_fault_state) {
5277 +       if (p->fault_state) {
5278                 talloc_free(r);
5279                 /* Return true here, srv_pipe_hnd.c will take care */
5280                 return true;
5281 @@ -957,7 +957,7 @@ static bool api_rap_NetPrintJobEnum(stru
5282
5283         _rap_NetPrintJobEnum(p, r);
5284
5285 -       if (p->rng_fault_state) {
5286 +       if (p->fault_state) {
5287                 talloc_free(r);
5288                 /* Return true here, srv_pipe_hnd.c will take care */
5289                 return true;
5290 @@ -1031,7 +1031,7 @@ static bool api_rap_NetPrintJobGetInfo(s
5291         ZERO_STRUCT(r->out);
5292         _rap_NetPrintJobGetInfo(p, r);
5293
5294 -       if (p->rng_fault_state) {
5295 +       if (p->fault_state) {
5296                 talloc_free(r);
5297                 /* Return true here, srv_pipe_hnd.c will take care */
5298                 return true;
5299 @@ -1105,7 +1105,7 @@ static bool api_rap_NetPrintJobSetInfo(s
5300         ZERO_STRUCT(r->out);
5301         _rap_NetPrintJobSetInfo(p, r);
5302
5303 -       if (p->rng_fault_state) {
5304 +       if (p->fault_state) {
5305                 talloc_free(r);
5306                 /* Return true here, srv_pipe_hnd.c will take care */
5307                 return true;
5308 @@ -1185,7 +1185,7 @@ static bool api_rap_NetPrintDestEnum(str
5309
5310         _rap_NetPrintDestEnum(p, r);
5311
5312 -       if (p->rng_fault_state) {
5313 +       if (p->fault_state) {
5314                 talloc_free(r);
5315                 /* Return true here, srv_pipe_hnd.c will take care */
5316                 return true;
5317 @@ -1259,7 +1259,7 @@ static bool api_rap_NetPrintDestGetInfo(
5318         ZERO_STRUCT(r->out);
5319         _rap_NetPrintDestGetInfo(p, r);
5320
5321 -       if (p->rng_fault_state) {
5322 +       if (p->fault_state) {
5323                 talloc_free(r);
5324                 /* Return true here, srv_pipe_hnd.c will take care */
5325                 return true;
5326 @@ -1333,7 +1333,7 @@ static bool api_rap_NetUserPasswordSet2(
5327         ZERO_STRUCT(r->out);
5328         _rap_NetUserPasswordSet2(p, r);
5329
5330 -       if (p->rng_fault_state) {
5331 +       if (p->fault_state) {
5332                 talloc_free(r);
5333                 /* Return true here, srv_pipe_hnd.c will take care */
5334                 return true;
5335 @@ -1407,7 +1407,7 @@ static bool api_rap_NetOEMChangePassword
5336         ZERO_STRUCT(r->out);
5337         _rap_NetOEMChangePassword(p, r);
5338
5339 -       if (p->rng_fault_state) {
5340 +       if (p->fault_state) {
5341                 talloc_free(r);
5342                 /* Return true here, srv_pipe_hnd.c will take care */
5343                 return true;
5344 @@ -1481,7 +1481,7 @@ static bool api_rap_NetUserGetInfo(struc
5345         ZERO_STRUCT(r->out);
5346         _rap_NetUserGetInfo(p, r);
5347
5348 -       if (p->rng_fault_state) {
5349 +       if (p->fault_state) {
5350                 talloc_free(r);
5351                 /* Return true here, srv_pipe_hnd.c will take care */
5352                 return true;
5353 @@ -1561,7 +1561,7 @@ static bool api_rap_NetSessionEnum(struc
5354
5355         _rap_NetSessionEnum(p, r);
5356
5357 -       if (p->rng_fault_state) {
5358 +       if (p->fault_state) {
5359                 talloc_free(r);
5360                 /* Return true here, srv_pipe_hnd.c will take care */
5361                 return true;
5362 @@ -1635,7 +1635,7 @@ static bool api_rap_NetSessionGetInfo(st
5363         ZERO_STRUCT(r->out);
5364         _rap_NetSessionGetInfo(p, r);
5365
5366 -       if (p->rng_fault_state) {
5367 +       if (p->fault_state) {
5368                 talloc_free(r);
5369                 /* Return true here, srv_pipe_hnd.c will take care */
5370                 return true;
5371 @@ -1709,7 +1709,7 @@ static bool api_rap_NetUserAdd(struct pi
5372         ZERO_STRUCT(r->out);
5373         _rap_NetUserAdd(p, r);
5374
5375 -       if (p->rng_fault_state) {
5376 +       if (p->fault_state) {
5377                 talloc_free(r);
5378                 /* Return true here, srv_pipe_hnd.c will take care */
5379                 return true;
5380 @@ -1783,7 +1783,7 @@ static bool api_rap_NetUserDelete(struct
5381         ZERO_STRUCT(r->out);
5382         _rap_NetUserDelete(p, r);
5383
5384 -       if (p->rng_fault_state) {
5385 +       if (p->fault_state) {
5386                 talloc_free(r);
5387                 /* Return true here, srv_pipe_hnd.c will take care */
5388                 return true;
5389 @@ -1857,7 +1857,7 @@ static bool api_rap_NetRemoteTOD(struct
5390         ZERO_STRUCT(r->out);
5391         _rap_NetRemoteTOD(p, r);
5392
5393 -       if (p->rng_fault_state) {
5394 +       if (p->fault_state) {
5395                 talloc_free(r);
5396                 /* Return true here, srv_pipe_hnd.c will take care */
5397                 return true;
5398 --- a/source3/librpc/gen_ndr/srv_remact.c
5399 +++ b/source3/librpc/gen_ndr/srv_remact.c
5400 @@ -99,7 +99,7 @@ static bool api_RemoteActivation(struct
5401
5402         r->out.result = _RemoteActivation(p, r);
5403
5404 -       if (p->rng_fault_state) {
5405 +       if (p->fault_state) {
5406                 talloc_free(r);
5407                 /* Return true here, srv_pipe_hnd.c will take care */
5408                 return true;
5409 --- a/source3/librpc/gen_ndr/srv_rot.c
5410 +++ b/source3/librpc/gen_ndr/srv_rot.c
5411 @@ -51,7 +51,7 @@ static bool api_rot_add(struct pipes_str
5412
5413         r->out.result = _rot_add(p, r);
5414
5415 -       if (p->rng_fault_state) {
5416 +       if (p->fault_state) {
5417                 talloc_free(r);
5418                 /* Return true here, srv_pipe_hnd.c will take care */
5419                 return true;
5420 @@ -124,7 +124,7 @@ static bool api_rot_remove(struct pipes_
5421
5422         r->out.result = _rot_remove(p, r);
5423
5424 -       if (p->rng_fault_state) {
5425 +       if (p->fault_state) {
5426                 talloc_free(r);
5427                 /* Return true here, srv_pipe_hnd.c will take care */
5428                 return true;
5429 @@ -197,7 +197,7 @@ static bool api_rot_is_listed(struct pip
5430
5431         r->out.result = _rot_is_listed(p, r);
5432
5433 -       if (p->rng_fault_state) {
5434 +       if (p->fault_state) {
5435                 talloc_free(r);
5436                 /* Return true here, srv_pipe_hnd.c will take care */
5437                 return true;
5438 @@ -277,7 +277,7 @@ static bool api_rot_get_interface_pointe
5439
5440         r->out.result = _rot_get_interface_pointer(p, r);
5441
5442 -       if (p->rng_fault_state) {
5443 +       if (p->fault_state) {
5444                 talloc_free(r);
5445                 /* Return true here, srv_pipe_hnd.c will take care */
5446                 return true;
5447 @@ -350,7 +350,7 @@ static bool api_rot_set_modification_tim
5448
5449         r->out.result = _rot_set_modification_time(p, r);
5450
5451 -       if (p->rng_fault_state) {
5452 +       if (p->fault_state) {
5453                 talloc_free(r);
5454                 /* Return true here, srv_pipe_hnd.c will take care */
5455                 return true;
5456 @@ -430,7 +430,7 @@ static bool api_rot_get_modification_tim
5457
5458         r->out.result = _rot_get_modification_time(p, r);
5459
5460 -       if (p->rng_fault_state) {
5461 +       if (p->fault_state) {
5462                 talloc_free(r);
5463                 /* Return true here, srv_pipe_hnd.c will take care */
5464                 return true;
5465 @@ -510,7 +510,7 @@ static bool api_rot_enum(struct pipes_st
5466
5467         r->out.result = _rot_enum(p, r);
5468
5469 -       if (p->rng_fault_state) {
5470 +       if (p->fault_state) {
5471                 talloc_free(r);
5472                 /* Return true here, srv_pipe_hnd.c will take care */
5473                 return true;
5474 --- a/source3/librpc/gen_ndr/srv_samr.c
5475 +++ b/source3/librpc/gen_ndr/srv_samr.c
5476 @@ -51,7 +51,7 @@ static bool api_samr_Connect(struct pipe
5477
5478         r->out.result = _samr_Connect(p, r);
5479
5480 -       if (p->rng_fault_state) {
5481 +       if (p->fault_state) {
5482                 talloc_free(r);
5483                 /* Return true here, srv_pipe_hnd.c will take care */
5484                 return true;
5485 @@ -126,7 +126,7 @@ static bool api_samr_Close(struct pipes_
5486         r->out.handle = r->in.handle;
5487         r->out.result = _samr_Close(p, r);
5488
5489 -       if (p->rng_fault_state) {
5490 +       if (p->fault_state) {
5491                 talloc_free(r);
5492                 /* Return true here, srv_pipe_hnd.c will take care */
5493                 return true;
5494 @@ -199,7 +199,7 @@ static bool api_samr_SetSecurity(struct
5495
5496         r->out.result = _samr_SetSecurity(p, r);
5497
5498 -       if (p->rng_fault_state) {
5499 +       if (p->fault_state) {
5500                 talloc_free(r);
5501                 /* Return true here, srv_pipe_hnd.c will take care */
5502                 return true;
5503 @@ -279,7 +279,7 @@ static bool api_samr_QuerySecurity(struc
5504
5505         r->out.result = _samr_QuerySecurity(p, r);
5506
5507 -       if (p->rng_fault_state) {
5508 +       if (p->fault_state) {
5509                 talloc_free(r);
5510                 /* Return true here, srv_pipe_hnd.c will take care */
5511                 return true;
5512 @@ -352,7 +352,7 @@ static bool api_samr_Shutdown(struct pip
5513
5514         r->out.result = _samr_Shutdown(p, r);
5515
5516 -       if (p->rng_fault_state) {
5517 +       if (p->fault_state) {
5518                 talloc_free(r);
5519                 /* Return true here, srv_pipe_hnd.c will take care */
5520                 return true;
5521 @@ -432,7 +432,7 @@ static bool api_samr_LookupDomain(struct
5522
5523         r->out.result = _samr_LookupDomain(p, r);
5524
5525 -       if (p->rng_fault_state) {
5526 +       if (p->fault_state) {
5527                 talloc_free(r);
5528                 /* Return true here, srv_pipe_hnd.c will take care */
5529                 return true;
5530 @@ -519,7 +519,7 @@ static bool api_samr_EnumDomains(struct
5531
5532         r->out.result = _samr_EnumDomains(p, r);
5533
5534 -       if (p->rng_fault_state) {
5535 +       if (p->fault_state) {
5536                 talloc_free(r);
5537                 /* Return true here, srv_pipe_hnd.c will take care */
5538                 return true;
5539 @@ -599,7 +599,7 @@ static bool api_samr_OpenDomain(struct p
5540
5541         r->out.result = _samr_OpenDomain(p, r);
5542
5543 -       if (p->rng_fault_state) {
5544 +       if (p->fault_state) {
5545                 talloc_free(r);
5546                 /* Return true here, srv_pipe_hnd.c will take care */
5547                 return true;
5548 @@ -679,7 +679,7 @@ static bool api_samr_QueryDomainInfo(str
5549
5550         r->out.result = _samr_QueryDomainInfo(p, r);
5551
5552 -       if (p->rng_fault_state) {
5553 +       if (p->fault_state) {
5554                 talloc_free(r);
5555                 /* Return true here, srv_pipe_hnd.c will take care */
5556                 return true;
5557 @@ -752,7 +752,7 @@ static bool api_samr_SetDomainInfo(struc
5558
5559         r->out.result = _samr_SetDomainInfo(p, r);
5560
5561 -       if (p->rng_fault_state) {
5562 +       if (p->fault_state) {
5563                 talloc_free(r);
5564                 /* Return true here, srv_pipe_hnd.c will take care */
5565                 return true;
5566 @@ -838,7 +838,7 @@ static bool api_samr_CreateDomainGroup(s
5567
5568         r->out.result = _samr_CreateDomainGroup(p, r);
5569
5570 -       if (p->rng_fault_state) {
5571 +       if (p->fault_state) {
5572                 talloc_free(r);
5573                 /* Return true here, srv_pipe_hnd.c will take care */
5574                 return true;
5575 @@ -925,7 +925,7 @@ static bool api_samr_EnumDomainGroups(st
5576
5577         r->out.result = _samr_EnumDomainGroups(p, r);
5578
5579 -       if (p->rng_fault_state) {
5580 +       if (p->fault_state) {
5581                 talloc_free(r);
5582                 /* Return true here, srv_pipe_hnd.c will take care */
5583                 return true;
5584 @@ -1011,7 +1011,7 @@ static bool api_samr_CreateUser(struct p
5585
5586         r->out.result = _samr_CreateUser(p, r);
5587
5588 -       if (p->rng_fault_state) {
5589 +       if (p->fault_state) {
5590                 talloc_free(r);
5591                 /* Return true here, srv_pipe_hnd.c will take care */
5592                 return true;
5593 @@ -1098,7 +1098,7 @@ static bool api_samr_EnumDomainUsers(str
5594
5595         r->out.result = _samr_EnumDomainUsers(p, r);
5596
5597 -       if (p->rng_fault_state) {
5598 +       if (p->fault_state) {
5599                 talloc_free(r);
5600                 /* Return true here, srv_pipe_hnd.c will take care */
5601                 return true;
5602 @@ -1184,7 +1184,7 @@ static bool api_samr_CreateDomAlias(stru
5603
5604         r->out.result = _samr_CreateDomAlias(p, r);
5605
5606 -       if (p->rng_fault_state) {
5607 +       if (p->fault_state) {
5608                 talloc_free(r);
5609                 /* Return true here, srv_pipe_hnd.c will take care */
5610                 return true;
5611 @@ -1271,7 +1271,7 @@ static bool api_samr_EnumDomainAliases(s
5612
5613         r->out.result = _samr_EnumDomainAliases(p, r);
5614
5615 -       if (p->rng_fault_state) {
5616 +       if (p->fault_state) {
5617                 talloc_free(r);
5618                 /* Return true here, srv_pipe_hnd.c will take care */
5619                 return true;
5620 @@ -1351,7 +1351,7 @@ static bool api_samr_GetAliasMembership(
5621
5622         r->out.result = _samr_GetAliasMembership(p, r);
5623
5624 -       if (p->rng_fault_state) {
5625 +       if (p->fault_state) {
5626                 talloc_free(r);
5627                 /* Return true here, srv_pipe_hnd.c will take care */
5628                 return true;
5629 @@ -1437,7 +1437,7 @@ static bool api_samr_LookupNames(struct
5630
5631         r->out.result = _samr_LookupNames(p, r);
5632
5633 -       if (p->rng_fault_state) {
5634 +       if (p->fault_state) {
5635                 talloc_free(r);
5636                 /* Return true here, srv_pipe_hnd.c will take care */
5637                 return true;
5638 @@ -1523,7 +1523,7 @@ static bool api_samr_LookupRids(struct p
5639
5640         r->out.result = _samr_LookupRids(p, r);
5641
5642 -       if (p->rng_fault_state) {
5643 +       if (p->fault_state) {
5644                 talloc_free(r);
5645                 /* Return true here, srv_pipe_hnd.c will take care */
5646                 return true;
5647 @@ -1603,7 +1603,7 @@ static bool api_samr_OpenGroup(struct pi
5648
5649         r->out.result = _samr_OpenGroup(p, r);
5650
5651 -       if (p->rng_fault_state) {
5652 +       if (p->fault_state) {
5653                 talloc_free(r);
5654                 /* Return true here, srv_pipe_hnd.c will take care */
5655                 return true;
5656 @@ -1683,7 +1683,7 @@ static bool api_samr_QueryGroupInfo(stru
5657
5658         r->out.result = _samr_QueryGroupInfo(p, r);
5659
5660 -       if (p->rng_fault_state) {
5661 +       if (p->fault_state) {
5662                 talloc_free(r);
5663                 /* Return true here, srv_pipe_hnd.c will take care */
5664                 return true;
5665 @@ -1756,7 +1756,7 @@ static bool api_samr_SetGroupInfo(struct
5666
5667         r->out.result = _samr_SetGroupInfo(p, r);
5668
5669 -       if (p->rng_fault_state) {
5670 +       if (p->fault_state) {
5671                 talloc_free(r);
5672                 /* Return true here, srv_pipe_hnd.c will take care */
5673                 return true;
5674 @@ -1829,7 +1829,7 @@ static bool api_samr_AddGroupMember(stru
5675
5676         r->out.result = _samr_AddGroupMember(p, r);
5677
5678 -       if (p->rng_fault_state) {
5679 +       if (p->fault_state) {
5680                 talloc_free(r);
5681                 /* Return true here, srv_pipe_hnd.c will take care */
5682                 return true;
5683 @@ -1904,7 +1904,7 @@ static bool api_samr_DeleteDomainGroup(s
5684         r->out.group_handle = r->in.group_handle;
5685         r->out.result = _samr_DeleteDomainGroup(p, r);
5686
5687 -       if (p->rng_fault_state) {
5688 +       if (p->fault_state) {
5689                 talloc_free(r);
5690                 /* Return true here, srv_pipe_hnd.c will take care */
5691                 return true;
5692 @@ -1977,7 +1977,7 @@ static bool api_samr_DeleteGroupMember(s
5693
5694         r->out.result = _samr_DeleteGroupMember(p, r);
5695
5696 -       if (p->rng_fault_state) {
5697 +       if (p->fault_state) {
5698                 talloc_free(r);
5699                 /* Return true here, srv_pipe_hnd.c will take care */
5700                 return true;
5701 @@ -2057,7 +2057,7 @@ static bool api_samr_QueryGroupMember(st
5702
5703         r->out.result = _samr_QueryGroupMember(p, r);
5704
5705 -       if (p->rng_fault_state) {
5706 +       if (p->fault_state) {
5707                 talloc_free(r);
5708                 /* Return true here, srv_pipe_hnd.c will take care */
5709                 return true;
5710 @@ -2130,7 +2130,7 @@ static bool api_samr_SetMemberAttributes
5711
5712         r->out.result = _samr_SetMemberAttributesOfGroup(p, r);
5713
5714 -       if (p->rng_fault_state) {
5715 +       if (p->fault_state) {
5716                 talloc_free(r);
5717                 /* Return true here, srv_pipe_hnd.c will take care */
5718                 return true;
5719 @@ -2210,7 +2210,7 @@ static bool api_samr_OpenAlias(struct pi
5720
5721         r->out.result = _samr_OpenAlias(p, r);
5722
5723 -       if (p->rng_fault_state) {
5724 +       if (p->fault_state) {
5725                 talloc_free(r);
5726                 /* Return true here, srv_pipe_hnd.c will take care */
5727                 return true;
5728 @@ -2290,7 +2290,7 @@ static bool api_samr_QueryAliasInfo(stru
5729
5730         r->out.result = _samr_QueryAliasInfo(p, r);
5731
5732 -       if (p->rng_fault_state) {
5733 +       if (p->fault_state) {
5734                 talloc_free(r);
5735                 /* Return true here, srv_pipe_hnd.c will take care */
5736                 return true;
5737 @@ -2363,7 +2363,7 @@ static bool api_samr_SetAliasInfo(struct
5738
5739         r->out.result = _samr_SetAliasInfo(p, r);
5740
5741 -       if (p->rng_fault_state) {
5742 +       if (p->fault_state) {
5743                 talloc_free(r);
5744                 /* Return true here, srv_pipe_hnd.c will take care */
5745                 return true;
5746 @@ -2438,7 +2438,7 @@ static bool api_samr_DeleteDomAlias(stru
5747         r->out.alias_handle = r->in.alias_handle;
5748         r->out.result = _samr_DeleteDomAlias(p, r);
5749
5750 -       if (p->rng_fault_state) {
5751 +       if (p->fault_state) {
5752                 talloc_free(r);
5753                 /* Return true here, srv_pipe_hnd.c will take care */
5754                 return true;
5755 @@ -2511,7 +2511,7 @@ static bool api_samr_AddAliasMember(stru
5756
5757         r->out.result = _samr_AddAliasMember(p, r);
5758
5759 -       if (p->rng_fault_state) {
5760 +       if (p->fault_state) {
5761                 talloc_free(r);
5762                 /* Return true here, srv_pipe_hnd.c will take care */
5763                 return true;
5764 @@ -2584,7 +2584,7 @@ static bool api_samr_DeleteAliasMember(s
5765
5766         r->out.result = _samr_DeleteAliasMember(p, r);
5767
5768 -       if (p->rng_fault_state) {
5769 +       if (p->fault_state) {
5770                 talloc_free(r);
5771                 /* Return true here, srv_pipe_hnd.c will take care */
5772                 return true;
5773 @@ -2664,7 +2664,7 @@ static bool api_samr_GetMembersInAlias(s
5774
5775         r->out.result = _samr_GetMembersInAlias(p, r);
5776
5777 -       if (p->rng_fault_state) {
5778 +       if (p->fault_state) {
5779                 talloc_free(r);
5780                 /* Return true here, srv_pipe_hnd.c will take care */
5781                 return true;
5782 @@ -2744,7 +2744,7 @@ static bool api_samr_OpenUser(struct pip
5783
5784         r->out.result = _samr_OpenUser(p, r);
5785
5786 -       if (p->rng_fault_state) {
5787 +       if (p->fault_state) {
5788                 talloc_free(r);
5789                 /* Return true here, srv_pipe_hnd.c will take care */
5790                 return true;
5791 @@ -2819,7 +2819,7 @@ static bool api_samr_DeleteUser(struct p
5792         r->out.user_handle = r->in.user_handle;
5793         r->out.result = _samr_DeleteUser(p, r);
5794
5795 -       if (p->rng_fault_state) {
5796 +       if (p->fault_state) {
5797                 talloc_free(r);
5798                 /* Return true here, srv_pipe_hnd.c will take care */
5799                 return true;
5800 @@ -2899,7 +2899,7 @@ static bool api_samr_QueryUserInfo(struc
5801
5802         r->out.result = _samr_QueryUserInfo(p, r);
5803
5804 -       if (p->rng_fault_state) {
5805 +       if (p->fault_state) {
5806                 talloc_free(r);
5807                 /* Return true here, srv_pipe_hnd.c will take care */
5808                 return true;
5809 @@ -2972,7 +2972,7 @@ static bool api_samr_SetUserInfo(struct
5810
5811         r->out.result = _samr_SetUserInfo(p, r);
5812
5813 -       if (p->rng_fault_state) {
5814 +       if (p->fault_state) {
5815                 talloc_free(r);
5816                 /* Return true here, srv_pipe_hnd.c will take care */
5817                 return true;
5818 @@ -3045,7 +3045,7 @@ static bool api_samr_ChangePasswordUser(
5819
5820         r->out.result = _samr_ChangePasswordUser(p, r);
5821
5822 -       if (p->rng_fault_state) {
5823 +       if (p->fault_state) {
5824                 talloc_free(r);
5825                 /* Return true here, srv_pipe_hnd.c will take care */
5826                 return true;
5827 @@ -3125,7 +3125,7 @@ static bool api_samr_GetGroupsForUser(st
5828
5829         r->out.result = _samr_GetGroupsForUser(p, r);
5830
5831 -       if (p->rng_fault_state) {
5832 +       if (p->fault_state) {
5833                 talloc_free(r);
5834                 /* Return true here, srv_pipe_hnd.c will take care */
5835                 return true;
5836 @@ -3217,7 +3217,7 @@ static bool api_samr_QueryDisplayInfo(st
5837
5838         r->out.result = _samr_QueryDisplayInfo(p, r);
5839
5840 -       if (p->rng_fault_state) {
5841 +       if (p->fault_state) {
5842                 talloc_free(r);
5843                 /* Return true here, srv_pipe_hnd.c will take care */
5844                 return true;
5845 @@ -3297,7 +3297,7 @@ static bool api_samr_GetDisplayEnumerati
5846
5847         r->out.result = _samr_GetDisplayEnumerationIndex(p, r);
5848
5849 -       if (p->rng_fault_state) {
5850 +       if (p->fault_state) {
5851                 talloc_free(r);
5852                 /* Return true here, srv_pipe_hnd.c will take care */
5853                 return true;
5854 @@ -3370,7 +3370,7 @@ static bool api_samr_TestPrivateFunction
5855
5856         r->out.result = _samr_TestPrivateFunctionsDomain(p, r);
5857
5858 -       if (p->rng_fault_state) {
5859 +       if (p->fault_state) {
5860                 talloc_free(r);
5861                 /* Return true here, srv_pipe_hnd.c will take care */
5862                 return true;
5863 @@ -3443,7 +3443,7 @@ static bool api_samr_TestPrivateFunction
5864
5865         r->out.result = _samr_TestPrivateFunctionsUser(p, r);
5866
5867 -       if (p->rng_fault_state) {
5868 +       if (p->fault_state) {
5869                 talloc_free(r);
5870                 /* Return true here, srv_pipe_hnd.c will take care */
5871                 return true;
5872 @@ -3523,7 +3523,7 @@ static bool api_samr_GetUserPwInfo(struc
5873
5874         r->out.result = _samr_GetUserPwInfo(p, r);
5875
5876 -       if (p->rng_fault_state) {
5877 +       if (p->fault_state) {
5878                 talloc_free(r);
5879                 /* Return true here, srv_pipe_hnd.c will take care */
5880                 return true;
5881 @@ -3596,7 +3596,7 @@ static bool api_samr_RemoveMemberFromFor
5882
5883         r->out.result = _samr_RemoveMemberFromForeignDomain(p, r);
5884
5885 -       if (p->rng_fault_state) {
5886 +       if (p->fault_state) {
5887                 talloc_free(r);
5888                 /* Return true here, srv_pipe_hnd.c will take care */
5889                 return true;
5890 @@ -3676,7 +3676,7 @@ static bool api_samr_QueryDomainInfo2(st
5891
5892         r->out.result = _samr_QueryDomainInfo2(p, r);
5893
5894 -       if (p->rng_fault_state) {
5895 +       if (p->fault_state) {
5896                 talloc_free(r);
5897                 /* Return true here, srv_pipe_hnd.c will take care */
5898                 return true;
5899 @@ -3756,7 +3756,7 @@ static bool api_samr_QueryUserInfo2(stru
5900
5901         r->out.result = _samr_QueryUserInfo2(p, r);
5902
5903 -       if (p->rng_fault_state) {
5904 +       if (p->fault_state) {
5905                 talloc_free(r);
5906                 /* Return true here, srv_pipe_hnd.c will take care */
5907                 return true;
5908 @@ -3848,7 +3848,7 @@ static bool api_samr_QueryDisplayInfo2(s
5909
5910         r->out.result = _samr_QueryDisplayInfo2(p, r);
5911
5912 -       if (p->rng_fault_state) {
5913 +       if (p->fault_state) {
5914                 talloc_free(r);
5915                 /* Return true here, srv_pipe_hnd.c will take care */
5916                 return true;
5917 @@ -3928,7 +3928,7 @@ static bool api_samr_GetDisplayEnumerati
5918
5919         r->out.result = _samr_GetDisplayEnumerationIndex2(p, r);
5920
5921 -       if (p->rng_fault_state) {
5922 +       if (p->fault_state) {
5923                 talloc_free(r);
5924                 /* Return true here, srv_pipe_hnd.c will take care */
5925                 return true;
5926 @@ -4020,7 +4020,7 @@ static bool api_samr_CreateUser2(struct
5927
5928         r->out.result = _samr_CreateUser2(p, r);
5929
5930 -       if (p->rng_fault_state) {
5931 +       if (p->fault_state) {
5932                 talloc_free(r);
5933                 /* Return true here, srv_pipe_hnd.c will take care */
5934                 return true;
5935 @@ -4112,7 +4112,7 @@ static bool api_samr_QueryDisplayInfo3(s
5936
5937         r->out.result = _samr_QueryDisplayInfo3(p, r);
5938
5939 -       if (p->rng_fault_state) {
5940 +       if (p->fault_state) {
5941                 talloc_free(r);
5942                 /* Return true here, srv_pipe_hnd.c will take care */
5943                 return true;
5944 @@ -4185,7 +4185,7 @@ static bool api_samr_AddMultipleMembersT
5945
5946         r->out.result = _samr_AddMultipleMembersToAlias(p, r);
5947
5948 -       if (p->rng_fault_state) {
5949 +       if (p->fault_state) {
5950                 talloc_free(r);
5951                 /* Return true here, srv_pipe_hnd.c will take care */
5952                 return true;
5953 @@ -4258,7 +4258,7 @@ static bool api_samr_RemoveMultipleMembe
5954
5955         r->out.result = _samr_RemoveMultipleMembersFromAlias(p, r);
5956
5957 -       if (p->rng_fault_state) {
5958 +       if (p->fault_state) {
5959                 talloc_free(r);
5960                 /* Return true here, srv_pipe_hnd.c will take care */
5961                 return true;
5962 @@ -4331,7 +4331,7 @@ static bool api_samr_OemChangePasswordUs
5963
5964         r->out.result = _samr_OemChangePasswordUser2(p, r);
5965
5966 -       if (p->rng_fault_state) {
5967 +       if (p->fault_state) {
5968                 talloc_free(r);
5969                 /* Return true here, srv_pipe_hnd.c will take care */
5970                 return true;
5971 @@ -4404,7 +4404,7 @@ static bool api_samr_ChangePasswordUser2
5972
5973         r->out.result = _samr_ChangePasswordUser2(p, r);
5974
5975 -       if (p->rng_fault_state) {
5976 +       if (p->fault_state) {
5977                 talloc_free(r);
5978                 /* Return true here, srv_pipe_hnd.c will take care */
5979                 return true;
5980 @@ -4484,7 +4484,7 @@ static bool api_samr_GetDomPwInfo(struct
5981
5982         r->out.result = _samr_GetDomPwInfo(p, r);
5983
5984 -       if (p->rng_fault_state) {
5985 +       if (p->fault_state) {
5986                 talloc_free(r);
5987                 /* Return true here, srv_pipe_hnd.c will take care */
5988                 return true;
5989 @@ -4564,7 +4564,7 @@ static bool api_samr_Connect2(struct pip
5990
5991         r->out.result = _samr_Connect2(p, r);
5992
5993 -       if (p->rng_fault_state) {
5994 +       if (p->fault_state) {
5995                 talloc_free(r);
5996                 /* Return true here, srv_pipe_hnd.c will take care */
5997                 return true;
5998 @@ -4637,7 +4637,7 @@ static bool api_samr_SetUserInfo2(struct
5999
6000         r->out.result = _samr_SetUserInfo2(p, r);
6001
6002 -       if (p->rng_fault_state) {
6003 +       if (p->fault_state) {
6004                 talloc_free(r);
6005                 /* Return true here, srv_pipe_hnd.c will take care */
6006                 return true;
6007 @@ -4710,7 +4710,7 @@ static bool api_samr_SetBootKeyInformati
6008
6009         r->out.result = _samr_SetBootKeyInformation(p, r);
6010
6011 -       if (p->rng_fault_state) {
6012 +       if (p->fault_state) {
6013                 talloc_free(r);
6014                 /* Return true here, srv_pipe_hnd.c will take care */
6015                 return true;
6016 @@ -4790,7 +4790,7 @@ static bool api_samr_GetBootKeyInformati
6017
6018         r->out.result = _samr_GetBootKeyInformation(p, r);
6019
6020 -       if (p->rng_fault_state) {
6021 +       if (p->fault_state) {
6022                 talloc_free(r);
6023                 /* Return true here, srv_pipe_hnd.c will take care */
6024                 return true;
6025 @@ -4870,7 +4870,7 @@ static bool api_samr_Connect3(struct pip
6026
6027         r->out.result = _samr_Connect3(p, r);
6028
6029 -       if (p->rng_fault_state) {
6030 +       if (p->fault_state) {
6031                 talloc_free(r);
6032                 /* Return true here, srv_pipe_hnd.c will take care */
6033                 return true;
6034 @@ -4950,7 +4950,7 @@ static bool api_samr_Connect4(struct pip
6035
6036         r->out.result = _samr_Connect4(p, r);
6037
6038 -       if (p->rng_fault_state) {
6039 +       if (p->fault_state) {
6040                 talloc_free(r);
6041                 /* Return true here, srv_pipe_hnd.c will take care */
6042                 return true;
6043 @@ -5036,7 +5036,7 @@ static bool api_samr_ChangePasswordUser3
6044
6045         r->out.result = _samr_ChangePasswordUser3(p, r);
6046
6047 -       if (p->rng_fault_state) {
6048 +       if (p->fault_state) {
6049                 talloc_free(r);
6050                 /* Return true here, srv_pipe_hnd.c will take care */
6051                 return true;
6052 @@ -5128,7 +5128,7 @@ static bool api_samr_Connect5(struct pip
6053
6054         r->out.result = _samr_Connect5(p, r);
6055
6056 -       if (p->rng_fault_state) {
6057 +       if (p->fault_state) {
6058                 talloc_free(r);
6059                 /* Return true here, srv_pipe_hnd.c will take care */
6060                 return true;
6061 @@ -5208,7 +5208,7 @@ static bool api_samr_RidToSid(struct pip
6062
6063         r->out.result = _samr_RidToSid(p, r);
6064
6065 -       if (p->rng_fault_state) {
6066 +       if (p->fault_state) {
6067                 talloc_free(r);
6068                 /* Return true here, srv_pipe_hnd.c will take care */
6069                 return true;
6070 @@ -5281,7 +5281,7 @@ static bool api_samr_SetDsrmPassword(str
6071
6072         r->out.result = _samr_SetDsrmPassword(p, r);
6073
6074 -       if (p->rng_fault_state) {
6075 +       if (p->fault_state) {
6076                 talloc_free(r);
6077                 /* Return true here, srv_pipe_hnd.c will take care */
6078                 return true;
6079 @@ -5361,7 +5361,7 @@ static bool api_samr_ValidatePassword(st
6080
6081         r->out.result = _samr_ValidatePassword(p, r);
6082
6083 -       if (p->rng_fault_state) {
6084 +       if (p->fault_state) {
6085                 talloc_free(r);
6086                 /* Return true here, srv_pipe_hnd.c will take care */
6087                 return true;
6088 --- a/source3/librpc/gen_ndr/srv_scerpc.c
6089 +++ b/source3/librpc/gen_ndr/srv_scerpc.c
6090 @@ -44,7 +44,7 @@ static bool api_scerpc_Unknown0(struct p
6091
6092         r->out.result = _scerpc_Unknown0(p, r);
6093
6094 -       if (p->rng_fault_state) {
6095 +       if (p->fault_state) {
6096                 talloc_free(r);
6097                 /* Return true here, srv_pipe_hnd.c will take care */
6098                 return true;
6099 --- a/source3/librpc/gen_ndr/srv_spoolss.c
6100 +++ b/source3/librpc/gen_ndr/srv_spoolss.c
6101 @@ -63,7 +63,7 @@ static bool api_spoolss_EnumPrinters(str
6102
6103         r->out.result = _spoolss_EnumPrinters(p, r);
6104
6105 -       if (p->rng_fault_state) {
6106 +       if (p->fault_state) {
6107                 talloc_free(r);
6108                 /* Return true here, srv_pipe_hnd.c will take care */
6109                 return true;
6110 @@ -143,7 +143,7 @@ static bool api_spoolss_OpenPrinter(stru
6111
6112         r->out.result = _spoolss_OpenPrinter(p, r);
6113
6114 -       if (p->rng_fault_state) {
6115 +       if (p->fault_state) {
6116                 talloc_free(r);
6117                 /* Return true here, srv_pipe_hnd.c will take care */
6118                 return true;
6119 @@ -216,7 +216,7 @@ static bool api_spoolss_SetJob(struct pi
6120
6121         r->out.result = _spoolss_SetJob(p, r);
6122
6123 -       if (p->rng_fault_state) {
6124 +       if (p->fault_state) {
6125                 talloc_free(r);
6126                 /* Return true here, srv_pipe_hnd.c will take care */
6127                 return true;
6128 @@ -302,7 +302,7 @@ static bool api_spoolss_GetJob(struct pi
6129
6130         r->out.result = _spoolss_GetJob(p, r);
6131
6132 -       if (p->rng_fault_state) {
6133 +       if (p->fault_state) {
6134                 talloc_free(r);
6135                 /* Return true here, srv_pipe_hnd.c will take care */
6136                 return true;
6137 @@ -394,7 +394,7 @@ static bool api_spoolss_EnumJobs(struct
6138
6139         r->out.result = _spoolss_EnumJobs(p, r);
6140
6141 -       if (p->rng_fault_state) {
6142 +       if (p->fault_state) {
6143                 talloc_free(r);
6144                 /* Return true here, srv_pipe_hnd.c will take care */
6145                 return true;
6146 @@ -474,7 +474,7 @@ static bool api_spoolss_AddPrinter(struc
6147
6148         r->out.result = _spoolss_AddPrinter(p, r);
6149
6150 -       if (p->rng_fault_state) {
6151 +       if (p->fault_state) {
6152                 talloc_free(r);
6153                 /* Return true here, srv_pipe_hnd.c will take care */
6154                 return true;
6155 @@ -547,7 +547,7 @@ static bool api_spoolss_DeletePrinter(st
6156
6157         r->out.result = _spoolss_DeletePrinter(p, r);
6158
6159 -       if (p->rng_fault_state) {
6160 +       if (p->fault_state) {
6161                 talloc_free(r);
6162                 /* Return true here, srv_pipe_hnd.c will take care */
6163                 return true;
6164 @@ -620,7 +620,7 @@ static bool api_spoolss_SetPrinter(struc
6165
6166         r->out.result = _spoolss_SetPrinter(p, r);
6167
6168 -       if (p->rng_fault_state) {
6169 +       if (p->fault_state) {
6170                 talloc_free(r);
6171                 /* Return true here, srv_pipe_hnd.c will take care */
6172                 return true;
6173 @@ -706,7 +706,7 @@ static bool api_spoolss_GetPrinter(struc
6174
6175         r->out.result = _spoolss_GetPrinter(p, r);
6176
6177 -       if (p->rng_fault_state) {
6178 +       if (p->fault_state) {
6179                 talloc_free(r);
6180                 /* Return true here, srv_pipe_hnd.c will take care */
6181                 return true;
6182 @@ -779,7 +779,7 @@ static bool api_spoolss_AddPrinterDriver
6183
6184         r->out.result = _spoolss_AddPrinterDriver(p, r);
6185
6186 -       if (p->rng_fault_state) {
6187 +       if (p->fault_state) {
6188                 talloc_free(r);
6189                 /* Return true here, srv_pipe_hnd.c will take care */
6190                 return true;
6191 @@ -871,7 +871,7 @@ static bool api_spoolss_EnumPrinterDrive
6192
6193         r->out.result = _spoolss_EnumPrinterDrivers(p, r);
6194
6195 -       if (p->rng_fault_state) {
6196 +       if (p->fault_state) {
6197                 talloc_free(r);
6198                 /* Return true here, srv_pipe_hnd.c will take care */
6199                 return true;
6200 @@ -957,7 +957,7 @@ static bool api_spoolss_GetPrinterDriver
6201
6202         r->out.result = _spoolss_GetPrinterDriver(p, r);
6203
6204 -       if (p->rng_fault_state) {
6205 +       if (p->fault_state) {
6206                 talloc_free(r);
6207                 /* Return true here, srv_pipe_hnd.c will take care */
6208                 return true;
6209 @@ -1043,7 +1043,7 @@ static bool api_spoolss_GetPrinterDriver
6210
6211         r->out.result = _spoolss_GetPrinterDriverDirectory(p, r);
6212
6213 -       if (p->rng_fault_state) {
6214 +       if (p->fault_state) {
6215                 talloc_free(r);
6216                 /* Return true here, srv_pipe_hnd.c will take care */
6217                 return true;
6218 @@ -1116,7 +1116,7 @@ static bool api_spoolss_DeletePrinterDri
6219
6220         r->out.result = _spoolss_DeletePrinterDriver(p, r);
6221
6222 -       if (p->rng_fault_state) {
6223 +       if (p->fault_state) {
6224                 talloc_free(r);
6225                 /* Return true here, srv_pipe_hnd.c will take care */
6226                 return true;
6227 @@ -1189,7 +1189,7 @@ static bool api_spoolss_AddPrintProcesso
6228
6229         r->out.result = _spoolss_AddPrintProcessor(p, r);
6230
6231 -       if (p->rng_fault_state) {
6232 +       if (p->fault_state) {
6233                 talloc_free(r);
6234                 /* Return true here, srv_pipe_hnd.c will take care */
6235                 return true;
6236 @@ -1281,7 +1281,7 @@ static bool api_spoolss_EnumPrintProcess
6237
6238         r->out.result = _spoolss_EnumPrintProcessors(p, r);
6239
6240 -       if (p->rng_fault_state) {
6241 +       if (p->fault_state) {
6242                 talloc_free(r);
6243                 /* Return true here, srv_pipe_hnd.c will take care */
6244                 return true;
6245 @@ -1367,7 +1367,7 @@ static bool api_spoolss_GetPrintProcesso
6246
6247         r->out.result = _spoolss_GetPrintProcessorDirectory(p, r);
6248
6249 -       if (p->rng_fault_state) {
6250 +       if (p->fault_state) {
6251                 talloc_free(r);
6252                 /* Return true here, srv_pipe_hnd.c will take care */
6253                 return true;
6254 @@ -1447,7 +1447,7 @@ static bool api_spoolss_StartDocPrinter(
6255
6256         r->out.result = _spoolss_StartDocPrinter(p, r);
6257
6258 -       if (p->rng_fault_state) {
6259 +       if (p->fault_state) {
6260                 talloc_free(r);
6261                 /* Return true here, srv_pipe_hnd.c will take care */
6262                 return true;
6263 @@ -1520,7 +1520,7 @@ static bool api_spoolss_StartPagePrinter
6264
6265         r->out.result = _spoolss_StartPagePrinter(p, r);
6266
6267 -       if (p->rng_fault_state) {
6268 +       if (p->fault_state) {
6269                 talloc_free(r);
6270                 /* Return true here, srv_pipe_hnd.c will take care */
6271                 return true;
6272 @@ -1600,7 +1600,7 @@ static bool api_spoolss_WritePrinter(str
6273
6274         r->out.result = _spoolss_WritePrinter(p, r);
6275
6276 -       if (p->rng_fault_state) {
6277 +       if (p->fault_state) {
6278                 talloc_free(r);
6279                 /* Return true here, srv_pipe_hnd.c will take care */
6280                 return true;
6281 @@ -1673,7 +1673,7 @@ static bool api_spoolss_EndPagePrinter(s
6282
6283         r->out.result = _spoolss_EndPagePrinter(p, r);
6284
6285 -       if (p->rng_fault_state) {
6286 +       if (p->fault_state) {
6287                 talloc_free(r);
6288                 /* Return true here, srv_pipe_hnd.c will take care */
6289                 return true;
6290 @@ -1746,7 +1746,7 @@ static bool api_spoolss_AbortPrinter(str
6291
6292         r->out.result = _spoolss_AbortPrinter(p, r);
6293
6294 -       if (p->rng_fault_state) {
6295 +       if (p->fault_state) {
6296                 talloc_free(r);
6297                 /* Return true here, srv_pipe_hnd.c will take care */
6298                 return true;
6299 @@ -1832,7 +1832,7 @@ static bool api_spoolss_ReadPrinter(stru
6300
6301         r->out.result = _spoolss_ReadPrinter(p, r);
6302
6303 -       if (p->rng_fault_state) {
6304 +       if (p->fault_state) {
6305                 talloc_free(r);
6306                 /* Return true here, srv_pipe_hnd.c will take care */
6307                 return true;
6308 @@ -1905,7 +1905,7 @@ static bool api_spoolss_EndDocPrinter(st
6309
6310         r->out.result = _spoolss_EndDocPrinter(p, r);
6311
6312 -       if (p->rng_fault_state) {
6313 +       if (p->fault_state) {
6314                 talloc_free(r);
6315                 /* Return true here, srv_pipe_hnd.c will take care */
6316                 return true;
6317 @@ -1986,7 +1986,7 @@ static bool api_spoolss_AddJob(struct pi
6318
6319         r->out.result = _spoolss_AddJob(p, r);
6320
6321 -       if (p->rng_fault_state) {
6322 +       if (p->fault_state) {
6323                 talloc_free(r);
6324                 /* Return true here, srv_pipe_hnd.c will take care */
6325                 return true;
6326 @@ -2059,7 +2059,7 @@ static bool api_spoolss_ScheduleJob(stru
6327
6328         r->out.result = _spoolss_ScheduleJob(p, r);
6329
6330 -       if (p->rng_fault_state) {
6331 +       if (p->fault_state) {
6332                 talloc_free(r);
6333                 /* Return true here, srv_pipe_hnd.c will take care */
6334                 return true;
6335 @@ -2151,7 +2151,7 @@ static bool api_spoolss_GetPrinterData(s
6336
6337         r->out.result = _spoolss_GetPrinterData(p, r);
6338
6339 -       if (p->rng_fault_state) {
6340 +       if (p->fault_state) {
6341                 talloc_free(r);
6342                 /* Return true here, srv_pipe_hnd.c will take care */
6343                 return true;
6344 @@ -2224,7 +2224,7 @@ static bool api_spoolss_SetPrinterData(s
6345
6346         r->out.result = _spoolss_SetPrinterData(p, r);
6347
6348 -       if (p->rng_fault_state) {
6349 +       if (p->fault_state) {
6350                 talloc_free(r);
6351                 /* Return true here, srv_pipe_hnd.c will take care */
6352                 return true;
6353 @@ -2297,7 +2297,7 @@ static bool api_spoolss_WaitForPrinterCh
6354
6355         r->out.result = _spoolss_WaitForPrinterChange(p, r);
6356
6357 -       if (p->rng_fault_state) {
6358 +       if (p->fault_state) {
6359                 talloc_free(r);
6360                 /* Return true here, srv_pipe_hnd.c will take care */
6361                 return true;
6362 @@ -2372,7 +2372,7 @@ static bool api_spoolss_ClosePrinter(str
6363         r->out.handle = r->in.handle;
6364         r->out.result = _spoolss_ClosePrinter(p, r);
6365
6366 -       if (p->rng_fault_state) {
6367 +       if (p->fault_state) {
6368                 talloc_free(r);
6369                 /* Return true here, srv_pipe_hnd.c will take care */
6370                 return true;
6371 @@ -2445,7 +2445,7 @@ static bool api_spoolss_AddForm(struct p
6372
6373         r->out.result = _spoolss_AddForm(p, r);
6374
6375 -       if (p->rng_fault_state) {
6376 +       if (p->fault_state) {
6377                 talloc_free(r);
6378                 /* Return true here, srv_pipe_hnd.c will take care */
6379                 return true;
6380 @@ -2518,7 +2518,7 @@ static bool api_spoolss_DeleteForm(struc
6381
6382         r->out.result = _spoolss_DeleteForm(p, r);
6383
6384 -       if (p->rng_fault_state) {
6385 +       if (p->fault_state) {
6386                 talloc_free(r);
6387                 /* Return true here, srv_pipe_hnd.c will take care */
6388                 return true;
6389 @@ -2604,7 +2604,7 @@ static bool api_spoolss_GetForm(struct p
6390
6391         r->out.result = _spoolss_GetForm(p, r);
6392
6393 -       if (p->rng_fault_state) {
6394 +       if (p->fault_state) {
6395                 talloc_free(r);
6396                 /* Return true here, srv_pipe_hnd.c will take care */
6397                 return true;
6398 @@ -2677,7 +2677,7 @@ static bool api_spoolss_SetForm(struct p
6399
6400         r->out.result = _spoolss_SetForm(p, r);
6401
6402 -       if (p->rng_fault_state) {
6403 +       if (p->fault_state) {
6404                 talloc_free(r);
6405                 /* Return true here, srv_pipe_hnd.c will take care */
6406                 return true;
6407 @@ -2769,7 +2769,7 @@ static bool api_spoolss_EnumForms(struct
6408
6409         r->out.result = _spoolss_EnumForms(p, r);
6410
6411 -       if (p->rng_fault_state) {
6412 +       if (p->fault_state) {
6413                 talloc_free(r);
6414                 /* Return true here, srv_pipe_hnd.c will take care */
6415                 return true;
6416 @@ -2861,7 +2861,7 @@ static bool api_spoolss_EnumPorts(struct
6417
6418         r->out.result = _spoolss_EnumPorts(p, r);
6419
6420 -       if (p->rng_fault_state) {
6421 +       if (p->fault_state) {
6422                 talloc_free(r);
6423                 /* Return true here, srv_pipe_hnd.c will take care */
6424                 return true;
6425 @@ -2953,7 +2953,7 @@ static bool api_spoolss_EnumMonitors(str
6426
6427         r->out.result = _spoolss_EnumMonitors(p, r);
6428
6429 -       if (p->rng_fault_state) {
6430 +       if (p->fault_state) {
6431                 talloc_free(r);
6432                 /* Return true here, srv_pipe_hnd.c will take care */
6433                 return true;
6434 @@ -3026,7 +3026,7 @@ static bool api_spoolss_AddPort(struct p
6435
6436         r->out.result = _spoolss_AddPort(p, r);
6437
6438 -       if (p->rng_fault_state) {
6439 +       if (p->fault_state) {
6440                 talloc_free(r);
6441                 /* Return true here, srv_pipe_hnd.c will take care */
6442                 return true;
6443 @@ -3099,7 +3099,7 @@ static bool api_spoolss_ConfigurePort(st
6444
6445         r->out.result = _spoolss_ConfigurePort(p, r);
6446
6447 -       if (p->rng_fault_state) {
6448 +       if (p->fault_state) {
6449                 talloc_free(r);
6450                 /* Return true here, srv_pipe_hnd.c will take care */
6451                 return true;
6452 @@ -3172,7 +3172,7 @@ static bool api_spoolss_DeletePort(struc
6453
6454         r->out.result = _spoolss_DeletePort(p, r);
6455
6456 -       if (p->rng_fault_state) {
6457 +       if (p->fault_state) {
6458                 talloc_free(r);
6459                 /* Return true here, srv_pipe_hnd.c will take care */
6460                 return true;
6461 @@ -3252,7 +3252,7 @@ static bool api_spoolss_CreatePrinterIC(
6462
6463         r->out.result = _spoolss_CreatePrinterIC(p, r);
6464
6465 -       if (p->rng_fault_state) {
6466 +       if (p->fault_state) {
6467                 talloc_free(r);
6468                 /* Return true here, srv_pipe_hnd.c will take care */
6469                 return true;
6470 @@ -3325,7 +3325,7 @@ static bool api_spoolss_PlayGDIScriptOnP
6471
6472         r->out.result = _spoolss_PlayGDIScriptOnPrinterIC(p, r);
6473
6474 -       if (p->rng_fault_state) {
6475 +       if (p->fault_state) {
6476                 talloc_free(r);
6477                 /* Return true here, srv_pipe_hnd.c will take care */
6478                 return true;
6479 @@ -3400,7 +3400,7 @@ static bool api_spoolss_DeletePrinterIC(
6480         r->out.gdi_handle = r->in.gdi_handle;
6481         r->out.result = _spoolss_DeletePrinterIC(p, r);
6482
6483 -       if (p->rng_fault_state) {
6484 +       if (p->fault_state) {
6485                 talloc_free(r);
6486                 /* Return true here, srv_pipe_hnd.c will take care */
6487                 return true;
6488 @@ -3473,7 +3473,7 @@ static bool api_spoolss_AddPrinterConnec
6489
6490         r->out.result = _spoolss_AddPrinterConnection(p, r);
6491
6492 -       if (p->rng_fault_state) {
6493 +       if (p->fault_state) {
6494                 talloc_free(r);
6495                 /* Return true here, srv_pipe_hnd.c will take care */
6496                 return true;
6497 @@ -3546,7 +3546,7 @@ static bool api_spoolss_DeletePrinterCon
6498
6499         r->out.result = _spoolss_DeletePrinterConnection(p, r);
6500
6501 -       if (p->rng_fault_state) {
6502 +       if (p->fault_state) {
6503                 talloc_free(r);
6504                 /* Return true here, srv_pipe_hnd.c will take care */
6505                 return true;
6506 @@ -3619,7 +3619,7 @@ static bool api_spoolss_PrinterMessageBo
6507
6508         r->out.result = _spoolss_PrinterMessageBox(p, r);
6509
6510 -       if (p->rng_fault_state) {
6511 +       if (p->fault_state) {
6512                 talloc_free(r);
6513                 /* Return true here, srv_pipe_hnd.c will take care */
6514                 return true;
6515 @@ -3692,7 +3692,7 @@ static bool api_spoolss_AddMonitor(struc
6516
6517         r->out.result = _spoolss_AddMonitor(p, r);
6518
6519 -       if (p->rng_fault_state) {
6520 +       if (p->fault_state) {
6521                 talloc_free(r);
6522                 /* Return true here, srv_pipe_hnd.c will take care */
6523                 return true;
6524 @@ -3765,7 +3765,7 @@ static bool api_spoolss_DeleteMonitor(st
6525
6526         r->out.result = _spoolss_DeleteMonitor(p, r);
6527
6528 -       if (p->rng_fault_state) {
6529 +       if (p->fault_state) {
6530                 talloc_free(r);
6531                 /* Return true here, srv_pipe_hnd.c will take care */
6532                 return true;
6533 @@ -3838,7 +3838,7 @@ static bool api_spoolss_DeletePrintProce
6534
6535         r->out.result = _spoolss_DeletePrintProcessor(p, r);
6536
6537 -       if (p->rng_fault_state) {
6538 +       if (p->fault_state) {
6539                 talloc_free(r);
6540                 /* Return true here, srv_pipe_hnd.c will take care */
6541                 return true;
6542 @@ -3911,7 +3911,7 @@ static bool api_spoolss_AddPrintProvidor
6543
6544         r->out.result = _spoolss_AddPrintProvidor(p, r);
6545
6546 -       if (p->rng_fault_state) {
6547 +       if (p->fault_state) {
6548                 talloc_free(r);
6549                 /* Return true here, srv_pipe_hnd.c will take care */
6550                 return true;
6551 @@ -3984,7 +3984,7 @@ static bool api_spoolss_DeletePrintProvi
6552
6553         r->out.result = _spoolss_DeletePrintProvidor(p, r);
6554
6555 -       if (p->rng_fault_state) {
6556 +       if (p->fault_state) {
6557                 talloc_free(r);
6558                 /* Return true here, srv_pipe_hnd.c will take care */
6559                 return true;
6560 @@ -4076,7 +4076,7 @@ static bool api_spoolss_EnumPrintProcDat
6561
6562         r->out.result = _spoolss_EnumPrintProcDataTypes(p, r);
6563
6564 -       if (p->rng_fault_state) {
6565 +       if (p->fault_state) {
6566                 talloc_free(r);
6567                 /* Return true here, srv_pipe_hnd.c will take care */
6568                 return true;
6569 @@ -4149,7 +4149,7 @@ static bool api_spoolss_ResetPrinter(str
6570
6571         r->out.result = _spoolss_ResetPrinter(p, r);
6572
6573 -       if (p->rng_fault_state) {
6574 +       if (p->fault_state) {
6575                 talloc_free(r);
6576                 /* Return true here, srv_pipe_hnd.c will take care */
6577                 return true;
6578 @@ -4247,7 +4247,7 @@ static bool api_spoolss_GetPrinterDriver
6579
6580         r->out.result = _spoolss_GetPrinterDriver2(p, r);
6581
6582 -       if (p->rng_fault_state) {
6583 +       if (p->fault_state) {
6584                 talloc_free(r);
6585                 /* Return true here, srv_pipe_hnd.c will take care */
6586                 return true;
6587 @@ -4320,7 +4320,7 @@ static bool api_spoolss_FindFirstPrinter
6588
6589         r->out.result = _spoolss_FindFirstPrinterChangeNotification(p, r);
6590
6591 -       if (p->rng_fault_state) {
6592 +       if (p->fault_state) {
6593                 talloc_free(r);
6594                 /* Return true here, srv_pipe_hnd.c will take care */
6595                 return true;
6596 @@ -4393,7 +4393,7 @@ static bool api_spoolss_FindNextPrinterC
6597
6598         r->out.result = _spoolss_FindNextPrinterChangeNotification(p, r);
6599
6600 -       if (p->rng_fault_state) {
6601 +       if (p->fault_state) {
6602                 talloc_free(r);
6603                 /* Return true here, srv_pipe_hnd.c will take care */
6604                 return true;
6605 @@ -4466,7 +4466,7 @@ static bool api_spoolss_FindClosePrinter
6606
6607         r->out.result = _spoolss_FindClosePrinterNotify(p, r);
6608
6609 -       if (p->rng_fault_state) {
6610 +       if (p->fault_state) {
6611                 talloc_free(r);
6612                 /* Return true here, srv_pipe_hnd.c will take care */
6613                 return true;
6614 @@ -4539,7 +4539,7 @@ static bool api_spoolss_RouterFindFirstP
6615
6616         r->out.result = _spoolss_RouterFindFirstPrinterChangeNotificationOld(p, r);
6617
6618 -       if (p->rng_fault_state) {
6619 +       if (p->fault_state) {
6620                 talloc_free(r);
6621                 /* Return true here, srv_pipe_hnd.c will take care */
6622                 return true;
6623 @@ -4619,7 +4619,7 @@ static bool api_spoolss_ReplyOpenPrinter
6624
6625         r->out.result = _spoolss_ReplyOpenPrinter(p, r);
6626
6627 -       if (p->rng_fault_state) {
6628 +       if (p->fault_state) {
6629                 talloc_free(r);
6630                 /* Return true here, srv_pipe_hnd.c will take care */
6631                 return true;
6632 @@ -4692,7 +4692,7 @@ static bool api_spoolss_RouterReplyPrint
6633
6634         r->out.result = _spoolss_RouterReplyPrinter(p, r);
6635
6636 -       if (p->rng_fault_state) {
6637 +       if (p->fault_state) {
6638                 talloc_free(r);
6639                 /* Return true here, srv_pipe_hnd.c will take care */
6640                 return true;
6641 @@ -4767,7 +4767,7 @@ static bool api_spoolss_ReplyClosePrinte
6642         r->out.handle = r->in.handle;
6643         r->out.result = _spoolss_ReplyClosePrinter(p, r);
6644
6645 -       if (p->rng_fault_state) {
6646 +       if (p->fault_state) {
6647                 talloc_free(r);
6648                 /* Return true here, srv_pipe_hnd.c will take care */
6649                 return true;
6650 @@ -4840,7 +4840,7 @@ static bool api_spoolss_AddPortEx(struct
6651
6652         r->out.result = _spoolss_AddPortEx(p, r);
6653
6654 -       if (p->rng_fault_state) {
6655 +       if (p->fault_state) {
6656                 talloc_free(r);
6657                 /* Return true here, srv_pipe_hnd.c will take care */
6658                 return true;
6659 @@ -4913,7 +4913,7 @@ static bool api_spoolss_RouterFindFirstP
6660
6661         r->out.result = _spoolss_RouterFindFirstPrinterChangeNotification(p, r);
6662
6663 -       if (p->rng_fault_state) {
6664 +       if (p->fault_state) {
6665                 talloc_free(r);
6666                 /* Return true here, srv_pipe_hnd.c will take care */
6667                 return true;
6668 @@ -4986,7 +4986,7 @@ static bool api_spoolss_SpoolerInit(stru
6669
6670         r->out.result = _spoolss_SpoolerInit(p, r);
6671
6672 -       if (p->rng_fault_state) {
6673 +       if (p->fault_state) {
6674                 talloc_free(r);
6675                 /* Return true here, srv_pipe_hnd.c will take care */
6676                 return true;
6677 @@ -5059,7 +5059,7 @@ static bool api_spoolss_ResetPrinterEx(s
6678
6679         r->out.result = _spoolss_ResetPrinterEx(p, r);
6680
6681 -       if (p->rng_fault_state) {
6682 +       if (p->fault_state) {
6683                 talloc_free(r);
6684                 /* Return true here, srv_pipe_hnd.c will take care */
6685                 return true;
6686 @@ -5132,7 +5132,7 @@ static bool api_spoolss_RemoteFindFirstP
6687
6688         r->out.result = _spoolss_RemoteFindFirstPrinterChangeNotifyEx(p, r);
6689
6690 -       if (p->rng_fault_state) {
6691 +       if (p->fault_state) {
6692                 talloc_free(r);
6693                 /* Return true here, srv_pipe_hnd.c will take care */
6694                 return true;
6695 @@ -5212,7 +5212,7 @@ static bool api_spoolss_RouterReplyPrint
6696
6697         r->out.result = _spoolss_RouterReplyPrinterEx(p, r);
6698
6699 -       if (p->rng_fault_state) {
6700 +       if (p->fault_state) {
6701                 talloc_free(r);
6702                 /* Return true here, srv_pipe_hnd.c will take care */
6703                 return true;
6704 @@ -5292,7 +5292,7 @@ static bool api_spoolss_RouterRefreshPri
6705
6706         r->out.result = _spoolss_RouterRefreshPrinterChangeNotify(p, r);
6707
6708 -       if (p->rng_fault_state) {
6709 +       if (p->fault_state) {
6710                 talloc_free(r);
6711                 /* Return true here, srv_pipe_hnd.c will take care */
6712                 return true;
6713 @@ -5365,7 +5365,7 @@ static bool api_spoolss_44(struct pipes_
6714
6715         r->out.result = _spoolss_44(p, r);
6716
6717 -       if (p->rng_fault_state) {
6718 +       if (p->fault_state) {
6719                 talloc_free(r);
6720                 /* Return true here, srv_pipe_hnd.c will take care */
6721                 return true;
6722 @@ -5445,7 +5445,7 @@ static bool api_spoolss_OpenPrinterEx(st
6723
6724         r->out.result = _spoolss_OpenPrinterEx(p, r);
6725
6726 -       if (p->rng_fault_state) {
6727 +       if (p->fault_state) {
6728                 talloc_free(r);
6729                 /* Return true here, srv_pipe_hnd.c will take care */
6730                 return true;
6731 @@ -5525,7 +5525,7 @@ static bool api_spoolss_AddPrinterEx(str
6732
6733         r->out.result = _spoolss_AddPrinterEx(p, r);
6734
6735 -       if (p->rng_fault_state) {
6736 +       if (p->fault_state) {
6737                 talloc_free(r);
6738                 /* Return true here, srv_pipe_hnd.c will take care */
6739                 return true;
6740 @@ -5598,7 +5598,7 @@ static bool api_spoolss_SetPort(struct p
6741
6742         r->out.result = _spoolss_SetPort(p, r);
6743
6744 -       if (p->rng_fault_state) {
6745 +       if (p->fault_state) {
6746                 talloc_free(r);
6747                 /* Return true here, srv_pipe_hnd.c will take care */
6748                 return true;
6749 @@ -5702,7 +5702,7 @@ static bool api_spoolss_EnumPrinterData(
6750
6751         r->out.result = _spoolss_EnumPrinterData(p, r);
6752
6753 -       if (p->rng_fault_state) {
6754 +       if (p->fault_state) {
6755                 talloc_free(r);
6756                 /* Return true here, srv_pipe_hnd.c will take care */
6757                 return true;
6758 @@ -5775,7 +5775,7 @@ static bool api_spoolss_DeletePrinterDat
6759
6760         r->out.result = _spoolss_DeletePrinterData(p, r);
6761
6762 -       if (p->rng_fault_state) {
6763 +       if (p->fault_state) {
6764                 talloc_free(r);
6765                 /* Return true here, srv_pipe_hnd.c will take care */
6766                 return true;
6767 @@ -5848,7 +5848,7 @@ static bool api_spoolss_4a(struct pipes_
6768
6769         r->out.result = _spoolss_4a(p, r);
6770
6771 -       if (p->rng_fault_state) {
6772 +       if (p->fault_state) {
6773                 talloc_free(r);
6774                 /* Return true here, srv_pipe_hnd.c will take care */
6775                 return true;
6776 @@ -5921,7 +5921,7 @@ static bool api_spoolss_4b(struct pipes_
6777
6778         r->out.result = _spoolss_4b(p, r);
6779
6780 -       if (p->rng_fault_state) {
6781 +       if (p->fault_state) {
6782                 talloc_free(r);
6783                 /* Return true here, srv_pipe_hnd.c will take care */
6784                 return true;
6785 @@ -5994,7 +5994,7 @@ static bool api_spoolss_4c(struct pipes_
6786
6787         r->out.result = _spoolss_4c(p, r);
6788
6789 -       if (p->rng_fault_state) {
6790 +       if (p->fault_state) {
6791                 talloc_free(r);
6792                 /* Return true here, srv_pipe_hnd.c will take care */
6793                 return true;
6794 @@ -6067,7 +6067,7 @@ static bool api_spoolss_SetPrinterDataEx
6795
6796         r->out.result = _spoolss_SetPrinterDataEx(p, r);
6797
6798 -       if (p->rng_fault_state) {
6799 +       if (p->fault_state) {
6800                 talloc_free(r);
6801                 /* Return true here, srv_pipe_hnd.c will take care */
6802                 return true;
6803 @@ -6159,7 +6159,7 @@ static bool api_spoolss_GetPrinterDataEx
6804
6805         r->out.result = _spoolss_GetPrinterDataEx(p, r);
6806
6807 -       if (p->rng_fault_state) {
6808 +       if (p->fault_state) {
6809                 talloc_free(r);
6810                 /* Return true here, srv_pipe_hnd.c will take care */
6811                 return true;
6812 @@ -6251,7 +6251,7 @@ static bool api_spoolss_EnumPrinterDataE
6813
6814         r->out.result = _spoolss_EnumPrinterDataEx(p, r);
6815
6816 -       if (p->rng_fault_state) {
6817 +       if (p->fault_state) {
6818                 talloc_free(r);
6819                 /* Return true here, srv_pipe_hnd.c will take care */
6820                 return true;
6821 @@ -6343,7 +6343,7 @@ static bool api_spoolss_EnumPrinterKey(s
6822
6823         r->out.result = _spoolss_EnumPrinterKey(p, r);
6824
6825 -       if (p->rng_fault_state) {
6826 +       if (p->fault_state) {
6827                 talloc_free(r);
6828                 /* Return true here, srv_pipe_hnd.c will take care */
6829                 return true;
6830 @@ -6416,7 +6416,7 @@ static bool api_spoolss_DeletePrinterDat
6831
6832         r->out.result = _spoolss_DeletePrinterDataEx(p, r);
6833
6834 -       if (p->rng_fault_state) {
6835 +       if (p->fault_state) {
6836                 talloc_free(r);
6837                 /* Return true here, srv_pipe_hnd.c will take care */
6838                 return true;
6839 @@ -6489,7 +6489,7 @@ static bool api_spoolss_DeletePrinterKey
6840
6841         r->out.result = _spoolss_DeletePrinterKey(p, r);
6842
6843 -       if (p->rng_fault_state) {
6844 +       if (p->fault_state) {
6845                 talloc_free(r);
6846                 /* Return true here, srv_pipe_hnd.c will take care */
6847                 return true;
6848 @@ -6562,7 +6562,7 @@ static bool api_spoolss_53(struct pipes_
6849
6850         r->out.result = _spoolss_53(p, r);
6851
6852 -       if (p->rng_fault_state) {
6853 +       if (p->fault_state) {
6854                 talloc_free(r);
6855                 /* Return true here, srv_pipe_hnd.c will take care */
6856                 return true;
6857 @@ -6635,7 +6635,7 @@ static bool api_spoolss_DeletePrinterDri
6858
6859         r->out.result = _spoolss_DeletePrinterDriverEx(p, r);
6860
6861 -       if (p->rng_fault_state) {
6862 +       if (p->fault_state) {
6863                 talloc_free(r);
6864                 /* Return true here, srv_pipe_hnd.c will take care */
6865                 return true;
6866 @@ -6708,7 +6708,7 @@ static bool api_spoolss_AddPerMachineCon
6867
6868         r->out.result = _spoolss_AddPerMachineConnection(p, r);
6869
6870 -       if (p->rng_fault_state) {
6871 +       if (p->fault_state) {
6872                 talloc_free(r);
6873                 /* Return true here, srv_pipe_hnd.c will take care */
6874                 return true;
6875 @@ -6781,7 +6781,7 @@ static bool api_spoolss_DeletePerMachine
6876
6877         r->out.result = _spoolss_DeletePerMachineConnection(p, r);
6878
6879 -       if (p->rng_fault_state) {
6880 +       if (p->fault_state) {
6881                 talloc_free(r);
6882                 /* Return true here, srv_pipe_hnd.c will take care */
6883                 return true;
6884 @@ -6854,7 +6854,7 @@ static bool api_spoolss_EnumPerMachineCo
6885
6886         r->out.result = _spoolss_EnumPerMachineConnections(p, r);
6887
6888 -       if (p->rng_fault_state) {
6889 +       if (p->fault_state) {
6890                 talloc_free(r);
6891                 /* Return true here, srv_pipe_hnd.c will take care */
6892                 return true;
6893 @@ -6941,7 +6941,7 @@ static bool api_spoolss_XcvData(struct p
6894
6895         r->out.result = _spoolss_XcvData(p, r);
6896
6897 -       if (p->rng_fault_state) {
6898 +       if (p->fault_state) {
6899                 talloc_free(r);
6900                 /* Return true here, srv_pipe_hnd.c will take care */
6901                 return true;
6902 @@ -7014,7 +7014,7 @@ static bool api_spoolss_AddPrinterDriver
6903
6904         r->out.result = _spoolss_AddPrinterDriverEx(p, r);
6905
6906 -       if (p->rng_fault_state) {
6907 +       if (p->fault_state) {
6908                 talloc_free(r);
6909                 /* Return true here, srv_pipe_hnd.c will take care */
6910                 return true;
6911 @@ -7087,7 +7087,7 @@ static bool api_spoolss_5a(struct pipes_
6912
6913         r->out.result = _spoolss_5a(p, r);
6914
6915 -       if (p->rng_fault_state) {
6916 +       if (p->fault_state) {
6917                 talloc_free(r);
6918                 /* Return true here, srv_pipe_hnd.c will take care */
6919                 return true;
6920 @@ -7160,7 +7160,7 @@ static bool api_spoolss_5b(struct pipes_
6921
6922         r->out.result = _spoolss_5b(p, r);
6923
6924 -       if (p->rng_fault_state) {
6925 +       if (p->fault_state) {
6926                 talloc_free(r);
6927                 /* Return true here, srv_pipe_hnd.c will take care */
6928                 return true;
6929 @@ -7233,7 +7233,7 @@ static bool api_spoolss_5c(struct pipes_
6930
6931         r->out.result = _spoolss_5c(p, r);
6932
6933 -       if (p->rng_fault_state) {
6934 +       if (p->fault_state) {
6935                 talloc_free(r);
6936                 /* Return true here, srv_pipe_hnd.c will take care */
6937                 return true;
6938 @@ -7306,7 +7306,7 @@ static bool api_spoolss_5d(struct pipes_
6939
6940         r->out.result = _spoolss_5d(p, r);
6941
6942 -       if (p->rng_fault_state) {
6943 +       if (p->fault_state) {
6944                 talloc_free(r);
6945                 /* Return true here, srv_pipe_hnd.c will take care */
6946                 return true;
6947 @@ -7379,7 +7379,7 @@ static bool api_spoolss_5e(struct pipes_
6948
6949         r->out.result = _spoolss_5e(p, r);
6950
6951 -       if (p->rng_fault_state) {
6952 +       if (p->fault_state) {
6953                 talloc_free(r);
6954                 /* Return true here, srv_pipe_hnd.c will take care */
6955                 return true;
6956 @@ -7452,7 +7452,7 @@ static bool api_spoolss_5f(struct pipes_
6957
6958         r->out.result = _spoolss_5f(p, r);
6959
6960 -       if (p->rng_fault_state) {
6961 +       if (p->fault_state) {
6962                 talloc_free(r);
6963                 /* Return true here, srv_pipe_hnd.c will take care */
6964                 return true;
6965 @@ -7525,7 +7525,7 @@ static bool api_spoolss_60(struct pipes_
6966
6967         r->out.result = _spoolss_60(p, r);
6968
6969 -       if (p->rng_fault_state) {
6970 +       if (p->fault_state) {
6971                 talloc_free(r);
6972                 /* Return true here, srv_pipe_hnd.c will take care */
6973                 return true;
6974 @@ -7598,7 +7598,7 @@ static bool api_spoolss_61(struct pipes_
6975
6976         r->out.result = _spoolss_61(p, r);
6977
6978 -       if (p->rng_fault_state) {
6979 +       if (p->fault_state) {
6980                 talloc_free(r);
6981                 /* Return true here, srv_pipe_hnd.c will take care */
6982                 return true;
6983 @@ -7671,7 +7671,7 @@ static bool api_spoolss_62(struct pipes_
6984
6985         r->out.result = _spoolss_62(p, r);
6986
6987 -       if (p->rng_fault_state) {
6988 +       if (p->fault_state) {
6989                 talloc_free(r);
6990                 /* Return true here, srv_pipe_hnd.c will take care */
6991                 return true;
6992 @@ -7744,7 +7744,7 @@ static bool api_spoolss_63(struct pipes_
6993
6994         r->out.result = _spoolss_63(p, r);
6995
6996 -       if (p->rng_fault_state) {
6997 +       if (p->fault_state) {
6998                 talloc_free(r);
6999                 /* Return true here, srv_pipe_hnd.c will take care */
7000                 return true;
7001 @@ -7817,7 +7817,7 @@ static bool api_spoolss_64(struct pipes_
7002
7003         r->out.result = _spoolss_64(p, r);
7004
7005 -       if (p->rng_fault_state) {
7006 +       if (p->fault_state) {
7007                 talloc_free(r);
7008                 /* Return true here, srv_pipe_hnd.c will take care */
7009                 return true;
7010 @@ -7890,7 +7890,7 @@ static bool api_spoolss_65(struct pipes_
7011
7012         r->out.result = _spoolss_65(p, r);
7013
7014 -       if (p->rng_fault_state) {
7015 +       if (p->fault_state) {
7016                 talloc_free(r);
7017                 /* Return true here, srv_pipe_hnd.c will take care */
7018                 return true;
7019 @@ -7970,7 +7970,7 @@ static bool api_spoolss_GetCorePrinterDr
7020
7021         r->out.result = _spoolss_GetCorePrinterDrivers(p, r);
7022
7023 -       if (p->rng_fault_state) {
7024 +       if (p->fault_state) {
7025                 talloc_free(r);
7026                 /* Return true here, srv_pipe_hnd.c will take care */
7027                 return true;
7028 @@ -8043,7 +8043,7 @@ static bool api_spoolss_67(struct pipes_
7029
7030         r->out.result = _spoolss_67(p, r);
7031
7032 -       if (p->rng_fault_state) {
7033 +       if (p->fault_state) {
7034                 talloc_free(r);
7035                 /* Return true here, srv_pipe_hnd.c will take care */
7036                 return true;
7037 @@ -8124,7 +8124,7 @@ static bool api_spoolss_GetPrinterDriver
7038
7039         r->out.result = _spoolss_GetPrinterDriverPackagePath(p, r);
7040
7041 -       if (p->rng_fault_state) {
7042 +       if (p->fault_state) {
7043                 talloc_free(r);
7044                 /* Return true here, srv_pipe_hnd.c will take care */
7045                 return true;
7046 @@ -8197,7 +8197,7 @@ static bool api_spoolss_69(struct pipes_
7047
7048         r->out.result = _spoolss_69(p, r);
7049
7050 -       if (p->rng_fault_state) {
7051 +       if (p->fault_state) {
7052                 talloc_free(r);
7053                 /* Return true here, srv_pipe_hnd.c will take care */
7054                 return true;
7055 @@ -8270,7 +8270,7 @@ static bool api_spoolss_6a(struct pipes_
7056
7057         r->out.result = _spoolss_6a(p, r);
7058
7059 -       if (p->rng_fault_state) {
7060 +       if (p->fault_state) {
7061                 talloc_free(r);
7062                 /* Return true here, srv_pipe_hnd.c will take care */
7063                 return true;
7064 @@ -8343,7 +8343,7 @@ static bool api_spoolss_6b(struct pipes_
7065
7066         r->out.result = _spoolss_6b(p, r);
7067
7068 -       if (p->rng_fault_state) {
7069 +       if (p->fault_state) {
7070                 talloc_free(r);
7071                 /* Return true here, srv_pipe_hnd.c will take care */
7072                 return true;
7073 @@ -8416,7 +8416,7 @@ static bool api_spoolss_6c(struct pipes_
7074
7075         r->out.result = _spoolss_6c(p, r);
7076
7077 -       if (p->rng_fault_state) {
7078 +       if (p->fault_state) {
7079                 talloc_free(r);
7080                 /* Return true here, srv_pipe_hnd.c will take care */
7081                 return true;
7082 @@ -8489,7 +8489,7 @@ static bool api_spoolss_6d(struct pipes_
7083
7084         r->out.result = _spoolss_6d(p, r);
7085
7086 -       if (p->rng_fault_state) {
7087 +       if (p->fault_state) {
7088                 talloc_free(r);
7089                 /* Return true here, srv_pipe_hnd.c will take care */
7090                 return true;
7091 --- a/source3/librpc/gen_ndr/srv_srvsvc.c
7092 +++ b/source3/librpc/gen_ndr/srv_srvsvc.c
7093 @@ -53,7 +53,7 @@ static bool api_srvsvc_NetCharDevEnum(st
7094
7095         r->out.result = _srvsvc_NetCharDevEnum(p, r);
7096
7097 -       if (p->rng_fault_state) {
7098 +       if (p->fault_state) {
7099                 talloc_free(r);
7100                 /* Return true here, srv_pipe_hnd.c will take care */
7101                 return true;
7102 @@ -133,7 +133,7 @@ static bool api_srvsvc_NetCharDevGetInfo
7103
7104         r->out.result = _srvsvc_NetCharDevGetInfo(p, r);
7105
7106 -       if (p->rng_fault_state) {
7107 +       if (p->fault_state) {
7108                 talloc_free(r);
7109                 /* Return true here, srv_pipe_hnd.c will take care */
7110                 return true;
7111 @@ -206,7 +206,7 @@ static bool api_srvsvc_NetCharDevControl
7112
7113         r->out.result = _srvsvc_NetCharDevControl(p, r);
7114
7115 -       if (p->rng_fault_state) {
7116 +       if (p->fault_state) {
7117                 talloc_free(r);
7118                 /* Return true here, srv_pipe_hnd.c will take care */
7119                 return true;
7120 @@ -288,7 +288,7 @@ static bool api_srvsvc_NetCharDevQEnum(s
7121
7122         r->out.result = _srvsvc_NetCharDevQEnum(p, r);
7123
7124 -       if (p->rng_fault_state) {
7125 +       if (p->fault_state) {
7126                 talloc_free(r);
7127                 /* Return true here, srv_pipe_hnd.c will take care */
7128                 return true;
7129 @@ -368,7 +368,7 @@ static bool api_srvsvc_NetCharDevQGetInf
7130
7131         r->out.result = _srvsvc_NetCharDevQGetInfo(p, r);
7132
7133 -       if (p->rng_fault_state) {
7134 +       if (p->fault_state) {
7135                 talloc_free(r);
7136                 /* Return true here, srv_pipe_hnd.c will take care */
7137                 return true;
7138 @@ -443,7 +443,7 @@ static bool api_srvsvc_NetCharDevQSetInf
7139         r->out.parm_error = r->in.parm_error;
7140         r->out.result = _srvsvc_NetCharDevQSetInfo(p, r);
7141
7142 -       if (p->rng_fault_state) {
7143 +       if (p->fault_state) {
7144                 talloc_free(r);
7145                 /* Return true here, srv_pipe_hnd.c will take care */
7146                 return true;
7147 @@ -516,7 +516,7 @@ static bool api_srvsvc_NetCharDevQPurge(
7148
7149         r->out.result = _srvsvc_NetCharDevQPurge(p, r);
7150
7151 -       if (p->rng_fault_state) {
7152 +       if (p->fault_state) {
7153                 talloc_free(r);
7154                 /* Return true here, srv_pipe_hnd.c will take care */
7155                 return true;
7156 @@ -589,7 +589,7 @@ static bool api_srvsvc_NetCharDevQPurgeS
7157
7158         r->out.result = _srvsvc_NetCharDevQPurgeSelf(p, r);
7159
7160 -       if (p->rng_fault_state) {
7161 +       if (p->fault_state) {
7162                 talloc_free(r);
7163                 /* Return true here, srv_pipe_hnd.c will take care */
7164                 return true;
7165 @@ -671,7 +671,7 @@ static bool api_srvsvc_NetConnEnum(struc
7166
7167         r->out.result = _srvsvc_NetConnEnum(p, r);
7168
7169 -       if (p->rng_fault_state) {
7170 +       if (p->fault_state) {
7171                 talloc_free(r);
7172                 /* Return true here, srv_pipe_hnd.c will take care */
7173                 return true;
7174 @@ -753,7 +753,7 @@ static bool api_srvsvc_NetFileEnum(struc
7175
7176         r->out.result = _srvsvc_NetFileEnum(p, r);
7177
7178 -       if (p->rng_fault_state) {
7179 +       if (p->fault_state) {
7180                 talloc_free(r);
7181                 /* Return true here, srv_pipe_hnd.c will take care */
7182                 return true;
7183 @@ -833,7 +833,7 @@ static bool api_srvsvc_NetFileGetInfo(st
7184
7185         r->out.result = _srvsvc_NetFileGetInfo(p, r);
7186
7187 -       if (p->rng_fault_state) {
7188 +       if (p->fault_state) {
7189                 talloc_free(r);
7190                 /* Return true here, srv_pipe_hnd.c will take care */
7191                 return true;
7192 @@ -906,7 +906,7 @@ static bool api_srvsvc_NetFileClose(stru
7193
7194         r->out.result = _srvsvc_NetFileClose(p, r);
7195
7196 -       if (p->rng_fault_state) {
7197 +       if (p->fault_state) {
7198                 talloc_free(r);
7199                 /* Return true here, srv_pipe_hnd.c will take care */
7200                 return true;
7201 @@ -988,7 +988,7 @@ static bool api_srvsvc_NetSessEnum(struc
7202
7203         r->out.result = _srvsvc_NetSessEnum(p, r);
7204
7205 -       if (p->rng_fault_state) {
7206 +       if (p->fault_state) {
7207                 talloc_free(r);
7208                 /* Return true here, srv_pipe_hnd.c will take care */
7209                 return true;
7210 @@ -1061,7 +1061,7 @@ static bool api_srvsvc_NetSessDel(struct
7211
7212         r->out.result = _srvsvc_NetSessDel(p, r);
7213
7214 -       if (p->rng_fault_state) {
7215 +       if (p->fault_state) {
7216                 talloc_free(r);
7217                 /* Return true here, srv_pipe_hnd.c will take care */
7218                 return true;
7219 @@ -1136,7 +1136,7 @@ static bool api_srvsvc_NetShareAdd(struc
7220         r->out.parm_error = r->in.parm_error;
7221         r->out.result = _srvsvc_NetShareAdd(p, r);
7222
7223 -       if (p->rng_fault_state) {
7224 +       if (p->fault_state) {
7225                 talloc_free(r);
7226                 /* Return true here, srv_pipe_hnd.c will take care */
7227                 return true;
7228 @@ -1218,7 +1218,7 @@ static bool api_srvsvc_NetShareEnumAll(s
7229
7230         r->out.result = _srvsvc_NetShareEnumAll(p, r);
7231
7232 -       if (p->rng_fault_state) {
7233 +       if (p->fault_state) {
7234                 talloc_free(r);
7235                 /* Return true here, srv_pipe_hnd.c will take care */
7236                 return true;
7237 @@ -1298,7 +1298,7 @@ static bool api_srvsvc_NetShareGetInfo(s
7238
7239         r->out.result = _srvsvc_NetShareGetInfo(p, r);
7240
7241 -       if (p->rng_fault_state) {
7242 +       if (p->fault_state) {
7243                 talloc_free(r);
7244                 /* Return true here, srv_pipe_hnd.c will take care */
7245                 return true;
7246 @@ -1373,7 +1373,7 @@ static bool api_srvsvc_NetShareSetInfo(s
7247         r->out.parm_error = r->in.parm_error;
7248         r->out.result = _srvsvc_NetShareSetInfo(p, r);
7249
7250 -       if (p->rng_fault_state) {
7251 +       if (p->fault_state) {
7252                 talloc_free(r);
7253                 /* Return true here, srv_pipe_hnd.c will take care */
7254                 return true;
7255 @@ -1446,7 +1446,7 @@ static bool api_srvsvc_NetShareDel(struc
7256
7257         r->out.result = _srvsvc_NetShareDel(p, r);
7258
7259 -       if (p->rng_fault_state) {
7260 +       if (p->fault_state) {
7261                 talloc_free(r);
7262                 /* Return true here, srv_pipe_hnd.c will take care */
7263                 return true;
7264 @@ -1519,7 +1519,7 @@ static bool api_srvsvc_NetShareDelSticky
7265
7266         r->out.result = _srvsvc_NetShareDelSticky(p, r);
7267
7268 -       if (p->rng_fault_state) {
7269 +       if (p->fault_state) {
7270                 talloc_free(r);
7271                 /* Return true here, srv_pipe_hnd.c will take care */
7272                 return true;
7273 @@ -1599,7 +1599,7 @@ static bool api_srvsvc_NetShareCheck(str
7274
7275         r->out.result = _srvsvc_NetShareCheck(p, r);
7276
7277 -       if (p->rng_fault_state) {
7278 +       if (p->fault_state) {
7279                 talloc_free(r);
7280                 /* Return true here, srv_pipe_hnd.c will take care */
7281                 return true;
7282 @@ -1679,7 +1679,7 @@ static bool api_srvsvc_NetSrvGetInfo(str
7283
7284         r->out.result = _srvsvc_NetSrvGetInfo(p, r);
7285
7286 -       if (p->rng_fault_state) {
7287 +       if (p->fault_state) {
7288                 talloc_free(r);
7289                 /* Return true here, srv_pipe_hnd.c will take care */
7290                 return true;
7291 @@ -1754,7 +1754,7 @@ static bool api_srvsvc_NetSrvSetInfo(str
7292         r->out.parm_error = r->in.parm_error;
7293         r->out.result = _srvsvc_NetSrvSetInfo(p, r);
7294
7295 -       if (p->rng_fault_state) {
7296 +       if (p->fault_state) {
7297                 talloc_free(r);
7298                 /* Return true here, srv_pipe_hnd.c will take care */
7299                 return true;
7300 @@ -1836,7 +1836,7 @@ static bool api_srvsvc_NetDiskEnum(struc
7301
7302         r->out.result = _srvsvc_NetDiskEnum(p, r);
7303
7304 -       if (p->rng_fault_state) {
7305 +       if (p->fault_state) {
7306                 talloc_free(r);
7307                 /* Return true here, srv_pipe_hnd.c will take care */
7308                 return true;
7309 @@ -1916,7 +1916,7 @@ static bool api_srvsvc_NetServerStatisti
7310
7311         r->out.result = _srvsvc_NetServerStatisticsGet(p, r);
7312
7313 -       if (p->rng_fault_state) {
7314 +       if (p->fault_state) {
7315                 talloc_free(r);
7316                 /* Return true here, srv_pipe_hnd.c will take care */
7317                 return true;
7318 @@ -1989,7 +1989,7 @@ static bool api_srvsvc_NetTransportAdd(s
7319
7320         r->out.result = _srvsvc_NetTransportAdd(p, r);
7321
7322 -       if (p->rng_fault_state) {
7323 +       if (p->fault_state) {
7324                 talloc_free(r);
7325                 /* Return true here, srv_pipe_hnd.c will take care */
7326                 return true;
7327 @@ -2071,7 +2071,7 @@ static bool api_srvsvc_NetTransportEnum(
7328
7329         r->out.result = _srvsvc_NetTransportEnum(p, r);
7330
7331 -       if (p->rng_fault_state) {
7332 +       if (p->fault_state) {
7333                 talloc_free(r);
7334                 /* Return true here, srv_pipe_hnd.c will take care */
7335                 return true;
7336 @@ -2144,7 +2144,7 @@ static bool api_srvsvc_NetTransportDel(s
7337
7338         r->out.result = _srvsvc_NetTransportDel(p, r);
7339
7340 -       if (p->rng_fault_state) {
7341 +       if (p->fault_state) {
7342                 talloc_free(r);
7343                 /* Return true here, srv_pipe_hnd.c will take care */
7344                 return true;
7345 @@ -2224,7 +2224,7 @@ static bool api_srvsvc_NetRemoteTOD(stru
7346
7347         r->out.result = _srvsvc_NetRemoteTOD(p, r);
7348
7349 -       if (p->rng_fault_state) {
7350 +       if (p->fault_state) {
7351                 talloc_free(r);
7352                 /* Return true here, srv_pipe_hnd.c will take care */
7353                 return true;
7354 @@ -2297,7 +2297,7 @@ static bool api_srvsvc_NetSetServiceBits
7355
7356         r->out.result = _srvsvc_NetSetServiceBits(p, r);
7357
7358 -       if (p->rng_fault_state) {
7359 +       if (p->fault_state) {
7360                 talloc_free(r);
7361                 /* Return true here, srv_pipe_hnd.c will take care */
7362                 return true;
7363 @@ -2377,7 +2377,7 @@ static bool api_srvsvc_NetPathType(struc
7364
7365         r->out.result = _srvsvc_NetPathType(p, r);
7366
7367 -       if (p->rng_fault_state) {
7368 +       if (p->fault_state) {
7369                 talloc_free(r);
7370                 /* Return true here, srv_pipe_hnd.c will take care */
7371                 return true;
7372 @@ -2458,7 +2458,7 @@ static bool api_srvsvc_NetPathCanonicali
7373
7374         r->out.result = _srvsvc_NetPathCanonicalize(p, r);
7375
7376 -       if (p->rng_fault_state) {
7377 +       if (p->fault_state) {
7378                 talloc_free(r);
7379                 /* Return true here, srv_pipe_hnd.c will take care */
7380                 return true;
7381 @@ -2531,7 +2531,7 @@ static bool api_srvsvc_NetPathCompare(st
7382
7383         r->out.result = _srvsvc_NetPathCompare(p, r);
7384
7385 -       if (p->rng_fault_state) {
7386 +       if (p->fault_state) {
7387                 talloc_free(r);
7388                 /* Return true here, srv_pipe_hnd.c will take care */
7389                 return true;
7390 @@ -2604,7 +2604,7 @@ static bool api_srvsvc_NetNameValidate(s
7391
7392         r->out.result = _srvsvc_NetNameValidate(p, r);
7393
7394 -       if (p->rng_fault_state) {
7395 +       if (p->fault_state) {
7396                 talloc_free(r);
7397                 /* Return true here, srv_pipe_hnd.c will take care */
7398                 return true;
7399 @@ -2677,7 +2677,7 @@ static bool api_srvsvc_NETRPRNAMECANONIC
7400
7401         r->out.result = _srvsvc_NETRPRNAMECANONICALIZE(p, r);
7402
7403 -       if (p->rng_fault_state) {
7404 +       if (p->fault_state) {
7405                 talloc_free(r);
7406                 /* Return true here, srv_pipe_hnd.c will take care */
7407                 return true;
7408 @@ -2750,7 +2750,7 @@ static bool api_srvsvc_NetPRNameCompare(
7409
7410         r->out.result = _srvsvc_NetPRNameCompare(p, r);
7411
7412 -       if (p->rng_fault_state) {
7413 +       if (p->fault_state) {
7414                 talloc_free(r);
7415                 /* Return true here, srv_pipe_hnd.c will take care */
7416                 return true;
7417 @@ -2832,7 +2832,7 @@ static bool api_srvsvc_NetShareEnum(stru
7418
7419         r->out.result = _srvsvc_NetShareEnum(p, r);
7420
7421 -       if (p->rng_fault_state) {
7422 +       if (p->fault_state) {
7423                 talloc_free(r);
7424                 /* Return true here, srv_pipe_hnd.c will take care */
7425                 return true;
7426 @@ -2912,7 +2912,7 @@ static bool api_srvsvc_NetShareDelStart(
7427
7428         r->out.result = _srvsvc_NetShareDelStart(p, r);
7429
7430 -       if (p->rng_fault_state) {
7431 +       if (p->fault_state) {
7432                 talloc_free(r);
7433                 /* Return true here, srv_pipe_hnd.c will take care */
7434                 return true;
7435 @@ -2987,7 +2987,7 @@ static bool api_srvsvc_NetShareDelCommit
7436         r->out.hnd = r->in.hnd;
7437         r->out.result = _srvsvc_NetShareDelCommit(p, r);
7438
7439 -       if (p->rng_fault_state) {
7440 +       if (p->fault_state) {
7441                 talloc_free(r);
7442                 /* Return true here, srv_pipe_hnd.c will take care */
7443                 return true;
7444 @@ -3067,7 +3067,7 @@ static bool api_srvsvc_NetGetFileSecurit
7445
7446         r->out.result = _srvsvc_NetGetFileSecurity(p, r);
7447
7448 -       if (p->rng_fault_state) {
7449 +       if (p->fault_state) {
7450                 talloc_free(r);
7451                 /* Return true here, srv_pipe_hnd.c will take care */
7452                 return true;
7453 @@ -3140,7 +3140,7 @@ static bool api_srvsvc_NetSetFileSecurit
7454
7455         r->out.result = _srvsvc_NetSetFileSecurity(p, r);
7456
7457 -       if (p->rng_fault_state) {
7458 +       if (p->fault_state) {
7459                 talloc_free(r);
7460                 /* Return true here, srv_pipe_hnd.c will take care */
7461                 return true;
7462 @@ -3213,7 +3213,7 @@ static bool api_srvsvc_NetServerTranspor
7463
7464         r->out.result = _srvsvc_NetServerTransportAddEx(p, r);
7465
7466 -       if (p->rng_fault_state) {
7467 +       if (p->fault_state) {
7468                 talloc_free(r);
7469                 /* Return true here, srv_pipe_hnd.c will take care */
7470                 return true;
7471 @@ -3286,7 +3286,7 @@ static bool api_srvsvc_NetServerSetServi
7472
7473         r->out.result = _srvsvc_NetServerSetServiceBitsEx(p, r);
7474
7475 -       if (p->rng_fault_state) {
7476 +       if (p->fault_state) {
7477                 talloc_free(r);
7478                 /* Return true here, srv_pipe_hnd.c will take care */
7479                 return true;
7480 @@ -3359,7 +3359,7 @@ static bool api_srvsvc_NETRDFSGETVERSION
7481
7482         r->out.result = _srvsvc_NETRDFSGETVERSION(p, r);
7483
7484 -       if (p->rng_fault_state) {
7485 +       if (p->fault_state) {
7486                 talloc_free(r);
7487                 /* Return true here, srv_pipe_hnd.c will take care */
7488                 return true;
7489 @@ -3432,7 +3432,7 @@ static bool api_srvsvc_NETRDFSCREATELOCA
7490
7491         r->out.result = _srvsvc_NETRDFSCREATELOCALPARTITION(p, r);
7492
7493 -       if (p->rng_fault_state) {
7494 +       if (p->fault_state) {
7495                 talloc_free(r);
7496                 /* Return true here, srv_pipe_hnd.c will take care */
7497                 return true;
7498 @@ -3505,7 +3505,7 @@ static bool api_srvsvc_NETRDFSDELETELOCA
7499
7500         r->out.result = _srvsvc_NETRDFSDELETELOCALPARTITION(p, r);
7501
7502 -       if (p->rng_fault_state) {
7503 +       if (p->fault_state) {
7504                 talloc_free(r);
7505                 /* Return true here, srv_pipe_hnd.c will take care */
7506                 return true;
7507 @@ -3578,7 +3578,7 @@ static bool api_srvsvc_NETRDFSSETLOCALVO
7508
7509         r->out.result = _srvsvc_NETRDFSSETLOCALVOLUMESTATE(p, r);
7510
7511 -       if (p->rng_fault_state) {
7512 +       if (p->fault_state) {
7513                 talloc_free(r);
7514                 /* Return true here, srv_pipe_hnd.c will take care */
7515                 return true;
7516 @@ -3651,7 +3651,7 @@ static bool api_srvsvc_NETRDFSSETSERVERI
7517
7518         r->out.result = _srvsvc_NETRDFSSETSERVERINFO(p, r);
7519
7520 -       if (p->rng_fault_state) {
7521 +       if (p->fault_state) {
7522                 talloc_free(r);
7523                 /* Return true here, srv_pipe_hnd.c will take care */
7524                 return true;
7525 @@ -3724,7 +3724,7 @@ static bool api_srvsvc_NETRDFSCREATEEXIT
7526
7527         r->out.result = _srvsvc_NETRDFSCREATEEXITPOINT(p, r);
7528
7529 -       if (p->rng_fault_state) {
7530 +       if (p->fault_state) {
7531                 talloc_free(r);
7532                 /* Return true here, srv_pipe_hnd.c will take care */
7533                 return true;
7534 @@ -3797,7 +3797,7 @@ static bool api_srvsvc_NETRDFSDELETEEXIT
7535
7536         r->out.result = _srvsvc_NETRDFSDELETEEXITPOINT(p, r);
7537
7538 -       if (p->rng_fault_state) {
7539 +       if (p->fault_state) {
7540                 talloc_free(r);
7541                 /* Return true here, srv_pipe_hnd.c will take care */
7542                 return true;
7543 @@ -3870,7 +3870,7 @@ static bool api_srvsvc_NETRDFSMODIFYPREF
7544
7545         r->out.result = _srvsvc_NETRDFSMODIFYPREFIX(p, r);
7546
7547 -       if (p->rng_fault_state) {
7548 +       if (p->fault_state) {
7549                 talloc_free(r);
7550                 /* Return true here, srv_pipe_hnd.c will take care */
7551                 return true;
7552 @@ -3943,7 +3943,7 @@ static bool api_srvsvc_NETRDFSFIXLOCALVO
7553
7554         r->out.result = _srvsvc_NETRDFSFIXLOCALVOLUME(p, r);
7555
7556 -       if (p->rng_fault_state) {
7557 +       if (p->fault_state) {
7558                 talloc_free(r);
7559                 /* Return true here, srv_pipe_hnd.c will take care */
7560                 return true;
7561 @@ -4016,7 +4016,7 @@ static bool api_srvsvc_NETRDFSMANAGERREP
7562
7563         r->out.result = _srvsvc_NETRDFSMANAGERREPORTSITEINFO(p, r);
7564
7565 -       if (p->rng_fault_state) {
7566 +       if (p->fault_state) {
7567                 talloc_free(r);
7568                 /* Return true here, srv_pipe_hnd.c will take care */
7569                 return true;
7570 @@ -4089,7 +4089,7 @@ static bool api_srvsvc_NETRSERVERTRANSPO
7571
7572         r->out.result = _srvsvc_NETRSERVERTRANSPORTDELEX(p, r);
7573
7574 -       if (p->rng_fault_state) {
7575 +       if (p->fault_state) {
7576                 talloc_free(r);
7577                 /* Return true here, srv_pipe_hnd.c will take care */
7578                 return true;
7579 --- a/source3/librpc/gen_ndr/srv_svcctl.c
7580 +++ b/source3/librpc/gen_ndr/srv_svcctl.c
7581 @@ -46,7 +46,7 @@ static bool api_svcctl_CloseServiceHandl
7582         r->out.handle = r->in.handle;
7583         r->out.result = _svcctl_CloseServiceHandle(p, r);
7584
7585 -       if (p->rng_fault_state) {
7586 +       if (p->fault_state) {
7587                 talloc_free(r);
7588                 /* Return true here, srv_pipe_hnd.c will take care */
7589                 return true;
7590 @@ -126,7 +126,7 @@ static bool api_svcctl_ControlService(st
7591
7592         r->out.result = _svcctl_ControlService(p, r);
7593
7594 -       if (p->rng_fault_state) {
7595 +       if (p->fault_state) {
7596                 talloc_free(r);
7597                 /* Return true here, srv_pipe_hnd.c will take care */
7598                 return true;
7599 @@ -199,7 +199,7 @@ static bool api_svcctl_DeleteService(str
7600
7601         r->out.result = _svcctl_DeleteService(p, r);
7602
7603 -       if (p->rng_fault_state) {
7604 +       if (p->fault_state) {
7605                 talloc_free(r);
7606                 /* Return true here, srv_pipe_hnd.c will take care */
7607                 return true;
7608 @@ -279,7 +279,7 @@ static bool api_svcctl_LockServiceDataba
7609
7610         r->out.result = _svcctl_LockServiceDatabase(p, r);
7611
7612 -       if (p->rng_fault_state) {
7613 +       if (p->fault_state) {
7614                 talloc_free(r);
7615                 /* Return true here, srv_pipe_hnd.c will take care */
7616                 return true;
7617 @@ -365,7 +365,7 @@ static bool api_svcctl_QueryServiceObjec
7618
7619         r->out.result = _svcctl_QueryServiceObjectSecurity(p, r);
7620
7621 -       if (p->rng_fault_state) {
7622 +       if (p->fault_state) {
7623                 talloc_free(r);
7624                 /* Return true here, srv_pipe_hnd.c will take care */
7625                 return true;
7626 @@ -438,7 +438,7 @@ static bool api_svcctl_SetServiceObjectS
7627
7628         r->out.result = _svcctl_SetServiceObjectSecurity(p, r);
7629
7630 -       if (p->rng_fault_state) {
7631 +       if (p->fault_state) {
7632                 talloc_free(r);
7633                 /* Return true here, srv_pipe_hnd.c will take care */
7634                 return true;
7635 @@ -518,7 +518,7 @@ static bool api_svcctl_QueryServiceStatu
7636
7637         r->out.result = _svcctl_QueryServiceStatus(p, r);
7638
7639 -       if (p->rng_fault_state) {
7640 +       if (p->fault_state) {
7641                 talloc_free(r);
7642                 /* Return true here, srv_pipe_hnd.c will take care */
7643                 return true;
7644 @@ -591,7 +591,7 @@ static bool api_svcctl_SetServiceStatus(
7645
7646         r->out.result = _svcctl_SetServiceStatus(p, r);
7647
7648 -       if (p->rng_fault_state) {
7649 +       if (p->fault_state) {
7650                 talloc_free(r);
7651                 /* Return true here, srv_pipe_hnd.c will take care */
7652                 return true;
7653 @@ -666,7 +666,7 @@ static bool api_svcctl_UnlockServiceData
7654         r->out.lock = r->in.lock;
7655         r->out.result = _svcctl_UnlockServiceDatabase(p, r);
7656
7657 -       if (p->rng_fault_state) {
7658 +       if (p->fault_state) {
7659                 talloc_free(r);
7660                 /* Return true here, srv_pipe_hnd.c will take care */
7661                 return true;
7662 @@ -739,7 +739,7 @@ static bool api_svcctl_NotifyBootConfigS
7663
7664         r->out.result = _svcctl_NotifyBootConfigStatus(p, r);
7665
7666 -       if (p->rng_fault_state) {
7667 +       if (p->fault_state) {
7668                 talloc_free(r);
7669                 /* Return true here, srv_pipe_hnd.c will take care */
7670                 return true;
7671 @@ -812,7 +812,7 @@ static bool api_svcctl_SCSetServiceBitsW
7672
7673         r->out.result = _svcctl_SCSetServiceBitsW(p, r);
7674
7675 -       if (p->rng_fault_state) {
7676 +       if (p->fault_state) {
7677                 talloc_free(r);
7678                 /* Return true here, srv_pipe_hnd.c will take care */
7679                 return true;
7680 @@ -892,7 +892,7 @@ static bool api_svcctl_ChangeServiceConf
7681
7682         r->out.result = _svcctl_ChangeServiceConfigW(p, r);
7683
7684 -       if (p->rng_fault_state) {
7685 +       if (p->fault_state) {
7686                 talloc_free(r);
7687                 /* Return true here, srv_pipe_hnd.c will take care */
7688                 return true;
7689 @@ -973,7 +973,7 @@ static bool api_svcctl_CreateServiceW(st
7690
7691         r->out.result = _svcctl_CreateServiceW(p, r);
7692
7693 -       if (p->rng_fault_state) {
7694 +       if (p->fault_state) {
7695                 talloc_free(r);
7696                 /* Return true here, srv_pipe_hnd.c will take care */
7697                 return true;
7698 @@ -1065,7 +1065,7 @@ static bool api_svcctl_EnumDependentServ
7699
7700         r->out.result = _svcctl_EnumDependentServicesW(p, r);
7701
7702 -       if (p->rng_fault_state) {
7703 +       if (p->fault_state) {
7704                 talloc_free(r);
7705                 /* Return true here, srv_pipe_hnd.c will take care */
7706                 return true;
7707 @@ -1158,7 +1158,7 @@ static bool api_svcctl_EnumServicesStatu
7708
7709         r->out.result = _svcctl_EnumServicesStatusW(p, r);
7710
7711 -       if (p->rng_fault_state) {
7712 +       if (p->fault_state) {
7713                 talloc_free(r);
7714                 /* Return true here, srv_pipe_hnd.c will take care */
7715                 return true;
7716 @@ -1238,7 +1238,7 @@ static bool api_svcctl_OpenSCManagerW(st
7717
7718         r->out.result = _svcctl_OpenSCManagerW(p, r);
7719
7720 -       if (p->rng_fault_state) {
7721 +       if (p->fault_state) {
7722                 talloc_free(r);
7723                 /* Return true here, srv_pipe_hnd.c will take care */
7724                 return true;
7725 @@ -1318,7 +1318,7 @@ static bool api_svcctl_OpenServiceW(stru
7726
7727         r->out.result = _svcctl_OpenServiceW(p, r);
7728
7729 -       if (p->rng_fault_state) {
7730 +       if (p->fault_state) {
7731                 talloc_free(r);
7732                 /* Return true here, srv_pipe_hnd.c will take care */
7733                 return true;
7734 @@ -1404,7 +1404,7 @@ static bool api_svcctl_QueryServiceConfi
7735
7736         r->out.result = _svcctl_QueryServiceConfigW(p, r);
7737
7738 -       if (p->rng_fault_state) {
7739 +       if (p->fault_state) {
7740                 talloc_free(r);
7741                 /* Return true here, srv_pipe_hnd.c will take care */
7742                 return true;
7743 @@ -1490,7 +1490,7 @@ static bool api_svcctl_QueryServiceLockS
7744
7745         r->out.result = _svcctl_QueryServiceLockStatusW(p, r);
7746
7747 -       if (p->rng_fault_state) {
7748 +       if (p->fault_state) {
7749                 talloc_free(r);
7750                 /* Return true here, srv_pipe_hnd.c will take care */
7751                 return true;
7752 @@ -1563,7 +1563,7 @@ static bool api_svcctl_StartServiceW(str
7753
7754         r->out.result = _svcctl_StartServiceW(p, r);
7755
7756 -       if (p->rng_fault_state) {
7757 +       if (p->fault_state) {
7758                 talloc_free(r);
7759                 /* Return true here, srv_pipe_hnd.c will take care */
7760                 return true;
7761 @@ -1644,7 +1644,7 @@ static bool api_svcctl_GetServiceDisplay
7762
7763         r->out.result = _svcctl_GetServiceDisplayNameW(p, r);
7764
7765 -       if (p->rng_fault_state) {
7766 +       if (p->fault_state) {
7767                 talloc_free(r);
7768                 /* Return true here, srv_pipe_hnd.c will take care */
7769                 return true;
7770 @@ -1725,7 +1725,7 @@ static bool api_svcctl_GetServiceKeyName
7771
7772         r->out.result = _svcctl_GetServiceKeyNameW(p, r);
7773
7774 -       if (p->rng_fault_state) {
7775 +       if (p->fault_state) {
7776                 talloc_free(r);
7777                 /* Return true here, srv_pipe_hnd.c will take care */
7778                 return true;
7779 @@ -1798,7 +1798,7 @@ static bool api_svcctl_SCSetServiceBitsA
7780
7781         r->out.result = _svcctl_SCSetServiceBitsA(p, r);
7782
7783 -       if (p->rng_fault_state) {
7784 +       if (p->fault_state) {
7785                 talloc_free(r);
7786                 /* Return true here, srv_pipe_hnd.c will take care */
7787                 return true;
7788 @@ -1878,7 +1878,7 @@ static bool api_svcctl_ChangeServiceConf
7789
7790         r->out.result = _svcctl_ChangeServiceConfigA(p, r);
7791
7792 -       if (p->rng_fault_state) {
7793 +       if (p->fault_state) {
7794                 talloc_free(r);
7795                 /* Return true here, srv_pipe_hnd.c will take care */
7796                 return true;
7797 @@ -1958,7 +1958,7 @@ static bool api_svcctl_CreateServiceA(st
7798
7799         r->out.result = _svcctl_CreateServiceA(p, r);
7800
7801 -       if (p->rng_fault_state) {
7802 +       if (p->fault_state) {
7803                 talloc_free(r);
7804                 /* Return true here, srv_pipe_hnd.c will take care */
7805                 return true;
7806 @@ -2050,7 +2050,7 @@ static bool api_svcctl_EnumDependentServ
7807
7808         r->out.result = _svcctl_EnumDependentServicesA(p, r);
7809
7810 -       if (p->rng_fault_state) {
7811 +       if (p->fault_state) {
7812                 talloc_free(r);
7813                 /* Return true here, srv_pipe_hnd.c will take care */
7814                 return true;
7815 @@ -2143,7 +2143,7 @@ static bool api_svcctl_EnumServicesStatu
7816
7817         r->out.result = _svcctl_EnumServicesStatusA(p, r);
7818
7819 -       if (p->rng_fault_state) {
7820 +       if (p->fault_state) {
7821                 talloc_free(r);
7822                 /* Return true here, srv_pipe_hnd.c will take care */
7823                 return true;
7824 @@ -2223,7 +2223,7 @@ static bool api_svcctl_OpenSCManagerA(st
7825
7826         r->out.result = _svcctl_OpenSCManagerA(p, r);
7827
7828 -       if (p->rng_fault_state) {
7829 +       if (p->fault_state) {
7830                 talloc_free(r);
7831                 /* Return true here, srv_pipe_hnd.c will take care */
7832                 return true;
7833 @@ -2296,7 +2296,7 @@ static bool api_svcctl_OpenServiceA(stru
7834
7835         r->out.result = _svcctl_OpenServiceA(p, r);
7836
7837 -       if (p->rng_fault_state) {
7838 +       if (p->fault_state) {
7839                 talloc_free(r);
7840                 /* Return true here, srv_pipe_hnd.c will take care */
7841                 return true;
7842 @@ -2382,7 +2382,7 @@ static bool api_svcctl_QueryServiceConfi
7843
7844         r->out.result = _svcctl_QueryServiceConfigA(p, r);
7845
7846 -       if (p->rng_fault_state) {
7847 +       if (p->fault_state) {
7848                 talloc_free(r);
7849                 /* Return true here, srv_pipe_hnd.c will take care */
7850                 return true;
7851 @@ -2468,7 +2468,7 @@ static bool api_svcctl_QueryServiceLockS
7852
7853         r->out.result = _svcctl_QueryServiceLockStatusA(p, r);
7854
7855 -       if (p->rng_fault_state) {
7856 +       if (p->fault_state) {
7857                 talloc_free(r);
7858                 /* Return true here, srv_pipe_hnd.c will take care */
7859                 return true;
7860 @@ -2541,7 +2541,7 @@ static bool api_svcctl_StartServiceA(str
7861
7862         r->out.result = _svcctl_StartServiceA(p, r);
7863
7864 -       if (p->rng_fault_state) {
7865 +       if (p->fault_state) {
7866                 talloc_free(r);
7867                 /* Return true here, srv_pipe_hnd.c will take care */
7868                 return true;
7869 @@ -2622,7 +2622,7 @@ static bool api_svcctl_GetServiceDisplay
7870
7871         r->out.result = _svcctl_GetServiceDisplayNameA(p, r);
7872
7873 -       if (p->rng_fault_state) {
7874 +       if (p->fault_state) {
7875                 talloc_free(r);
7876                 /* Return true here, srv_pipe_hnd.c will take care */
7877                 return true;
7878 @@ -2703,7 +2703,7 @@ static bool api_svcctl_GetServiceKeyName
7879
7880         r->out.result = _svcctl_GetServiceKeyNameA(p, r);
7881
7882 -       if (p->rng_fault_state) {
7883 +       if (p->fault_state) {
7884                 talloc_free(r);
7885                 /* Return true here, srv_pipe_hnd.c will take care */
7886                 return true;
7887 @@ -2776,7 +2776,7 @@ static bool api_svcctl_GetCurrentGroupeS
7888
7889         r->out.result = _svcctl_GetCurrentGroupeStateW(p, r);
7890
7891 -       if (p->rng_fault_state) {
7892 +       if (p->fault_state) {
7893                 talloc_free(r);
7894                 /* Return true here, srv_pipe_hnd.c will take care */
7895                 return true;
7896 @@ -2849,7 +2849,7 @@ static bool api_svcctl_EnumServiceGroupW
7897
7898         r->out.result = _svcctl_EnumServiceGroupW(p, r);
7899
7900 -       if (p->rng_fault_state) {
7901 +       if (p->fault_state) {
7902                 talloc_free(r);
7903                 /* Return true here, srv_pipe_hnd.c will take care */
7904                 return true;
7905 @@ -2922,7 +2922,7 @@ static bool api_svcctl_ChangeServiceConf
7906
7907         r->out.result = _svcctl_ChangeServiceConfig2A(p, r);
7908
7909 -       if (p->rng_fault_state) {
7910 +       if (p->fault_state) {
7911                 talloc_free(r);
7912                 /* Return true here, srv_pipe_hnd.c will take care */
7913                 return true;
7914 @@ -2995,7 +2995,7 @@ static bool api_svcctl_ChangeServiceConf
7915
7916         r->out.result = _svcctl_ChangeServiceConfig2W(p, r);
7917
7918 -       if (p->rng_fault_state) {
7919 +       if (p->fault_state) {
7920                 talloc_free(r);
7921                 /* Return true here, srv_pipe_hnd.c will take care */
7922                 return true;
7923 @@ -3081,7 +3081,7 @@ static bool api_svcctl_QueryServiceConfi
7924
7925         r->out.result = _svcctl_QueryServiceConfig2A(p, r);
7926
7927 -       if (p->rng_fault_state) {
7928 +       if (p->fault_state) {
7929                 talloc_free(r);
7930                 /* Return true here, srv_pipe_hnd.c will take care */
7931                 return true;
7932 @@ -3167,7 +3167,7 @@ static bool api_svcctl_QueryServiceConfi
7933
7934         r->out.result = _svcctl_QueryServiceConfig2W(p, r);
7935
7936 -       if (p->rng_fault_state) {
7937 +       if (p->fault_state) {
7938                 talloc_free(r);
7939                 /* Return true here, srv_pipe_hnd.c will take care */
7940                 return true;
7941 @@ -3253,7 +3253,7 @@ static bool api_svcctl_QueryServiceStatu
7942
7943         r->out.result = _svcctl_QueryServiceStatusEx(p, r);
7944
7945 -       if (p->rng_fault_state) {
7946 +       if (p->fault_state) {
7947                 talloc_free(r);
7948                 /* Return true here, srv_pipe_hnd.c will take care */
7949                 return true;
7950 @@ -3352,7 +3352,7 @@ static bool api_EnumServicesStatusExA(st
7951
7952         r->out.result = _EnumServicesStatusExA(p, r);
7953
7954 -       if (p->rng_fault_state) {
7955 +       if (p->fault_state) {
7956                 talloc_free(r);
7957                 /* Return true here, srv_pipe_hnd.c will take care */
7958                 return true;
7959 @@ -3445,7 +3445,7 @@ static bool api_EnumServicesStatusExW(st
7960
7961         r->out.result = _EnumServicesStatusExW(p, r);
7962
7963 -       if (p->rng_fault_state) {
7964 +       if (p->fault_state) {
7965                 talloc_free(r);
7966                 /* Return true here, srv_pipe_hnd.c will take care */
7967                 return true;
7968 @@ -3518,7 +3518,7 @@ static bool api_svcctl_SCSendTSMessage(s
7969
7970         r->out.result = _svcctl_SCSendTSMessage(p, r);
7971
7972 -       if (p->rng_fault_state) {
7973 +       if (p->fault_state) {
7974                 talloc_free(r);
7975                 /* Return true here, srv_pipe_hnd.c will take care */
7976                 return true;
7977 --- a/source3/librpc/gen_ndr/srv_trkwks.c
7978 +++ b/source3/librpc/gen_ndr/srv_trkwks.c
7979 @@ -44,7 +44,7 @@ static bool api_trkwks_Unknown0(struct p
7980
7981         r->out.result = _trkwks_Unknown0(p, r);
7982
7983 -       if (p->rng_fault_state) {
7984 +       if (p->fault_state) {
7985                 talloc_free(r);
7986                 /* Return true here, srv_pipe_hnd.c will take care */
7987                 return true;
7988 --- a/source3/librpc/gen_ndr/srv_unixinfo.c
7989 +++ b/source3/librpc/gen_ndr/srv_unixinfo.c
7990 @@ -51,7 +51,7 @@ static bool api_unixinfo_SidToUid(struct
7991
7992         r->out.result = _unixinfo_SidToUid(p, r);
7993
7994 -       if (p->rng_fault_state) {
7995 +       if (p->fault_state) {
7996                 talloc_free(r);
7997                 /* Return true here, srv_pipe_hnd.c will take care */
7998                 return true;
7999 @@ -131,7 +131,7 @@ static bool api_unixinfo_UidToSid(struct
8000
8001         r->out.result = _unixinfo_UidToSid(p, r);
8002
8003 -       if (p->rng_fault_state) {
8004 +       if (p->fault_state) {
8005                 talloc_free(r);
8006                 /* Return true here, srv_pipe_hnd.c will take care */
8007                 return true;
8008 @@ -211,7 +211,7 @@ static bool api_unixinfo_SidToGid(struct
8009
8010         r->out.result = _unixinfo_SidToGid(p, r);
8011
8012 -       if (p->rng_fault_state) {
8013 +       if (p->fault_state) {
8014                 talloc_free(r);
8015                 /* Return true here, srv_pipe_hnd.c will take care */
8016                 return true;
8017 @@ -291,7 +291,7 @@ static bool api_unixinfo_GidToSid(struct
8018
8019         r->out.result = _unixinfo_GidToSid(p, r);
8020
8021 -       if (p->rng_fault_state) {
8022 +       if (p->fault_state) {
8023                 talloc_free(r);
8024                 /* Return true here, srv_pipe_hnd.c will take care */
8025                 return true;
8026 @@ -372,7 +372,7 @@ static bool api_unixinfo_GetPWUid(struct
8027
8028         r->out.result = _unixinfo_GetPWUid(p, r);
8029
8030 -       if (p->rng_fault_state) {
8031 +       if (p->fault_state) {
8032                 talloc_free(r);
8033                 /* Return true here, srv_pipe_hnd.c will take care */
8034                 return true;
8035 --- a/source3/librpc/gen_ndr/srv_w32time.c
8036 +++ b/source3/librpc/gen_ndr/srv_w32time.c
8037 @@ -44,7 +44,7 @@ static bool api_w32time_SyncTime(struct
8038
8039         r->out.result = _w32time_SyncTime(p, r);
8040
8041 -       if (p->rng_fault_state) {
8042 +       if (p->fault_state) {
8043                 talloc_free(r);
8044                 /* Return true here, srv_pipe_hnd.c will take care */
8045                 return true;
8046 @@ -117,7 +117,7 @@ static bool api_w32time_GetNetLogonServi
8047
8048         r->out.result = _w32time_GetNetLogonServiceBits(p, r);
8049
8050 -       if (p->rng_fault_state) {
8051 +       if (p->fault_state) {
8052                 talloc_free(r);
8053                 /* Return true here, srv_pipe_hnd.c will take care */
8054                 return true;
8055 @@ -190,7 +190,7 @@ static bool api_w32time_QueryProviderSta
8056
8057         r->out.result = _w32time_QueryProviderStatus(p, r);
8058
8059 -       if (p->rng_fault_state) {
8060 +       if (p->fault_state) {
8061                 talloc_free(r);
8062                 /* Return true here, srv_pipe_hnd.c will take care */
8063                 return true;
8064 --- a/source3/librpc/gen_ndr/srv_wbint.c
8065 +++ b/source3/librpc/gen_ndr/srv_wbint.c
8066 @@ -51,7 +51,7 @@ static bool api_wbint_Ping(struct pipes_
8067
8068         _wbint_Ping(p, r);
8069
8070 -       if (p->rng_fault_state) {
8071 +       if (p->fault_state) {
8072                 talloc_free(r);
8073                 /* Return true here, srv_pipe_hnd.c will take care */
8074                 return true;
8075 @@ -143,7 +143,7 @@ static bool api_wbint_LookupSid(struct p
8076
8077         r->out.result = _wbint_LookupSid(p, r);
8078
8079 -       if (p->rng_fault_state) {
8080 +       if (p->fault_state) {
8081                 talloc_free(r);
8082                 /* Return true here, srv_pipe_hnd.c will take care */
8083                 return true;
8084 @@ -229,7 +229,7 @@ static bool api_wbint_LookupSids(struct
8085
8086         r->out.result = _wbint_LookupSids(p, r);
8087
8088 -       if (p->rng_fault_state) {
8089 +       if (p->fault_state) {
8090                 talloc_free(r);
8091                 /* Return true here, srv_pipe_hnd.c will take care */
8092                 return true;
8093 @@ -315,7 +315,7 @@ static bool api_wbint_LookupName(struct
8094
8095         r->out.result = _wbint_LookupName(p, r);
8096
8097 -       if (p->rng_fault_state) {
8098 +       if (p->fault_state) {
8099                 talloc_free(r);
8100                 /* Return true here, srv_pipe_hnd.c will take care */
8101                 return true;
8102 @@ -395,7 +395,7 @@ static bool api_wbint_Sid2Uid(struct pip
8103
8104         r->out.result = _wbint_Sid2Uid(p, r);
8105
8106 -       if (p->rng_fault_state) {
8107 +       if (p->fault_state) {
8108                 talloc_free(r);
8109                 /* Return true here, srv_pipe_hnd.c will take care */
8110                 return true;
8111 @@ -475,7 +475,7 @@ static bool api_wbint_Sid2Gid(struct pip
8112
8113         r->out.result = _wbint_Sid2Gid(p, r);
8114
8115 -       if (p->rng_fault_state) {
8116 +       if (p->fault_state) {
8117                 talloc_free(r);
8118                 /* Return true here, srv_pipe_hnd.c will take care */
8119                 return true;
8120 @@ -550,7 +550,7 @@ static bool api_wbint_Sids2UnixIDs(struc
8121         r->out.ids = r->in.ids;
8122         r->out.result = _wbint_Sids2UnixIDs(p, r);
8123
8124 -       if (p->rng_fault_state) {
8125 +       if (p->fault_state) {
8126                 talloc_free(r);
8127                 /* Return true here, srv_pipe_hnd.c will take care */
8128                 return true;
8129 @@ -630,7 +630,7 @@ static bool api_wbint_Uid2Sid(struct pip
8130
8131         r->out.result = _wbint_Uid2Sid(p, r);
8132
8133 -       if (p->rng_fault_state) {
8134 +       if (p->fault_state) {
8135                 talloc_free(r);
8136                 /* Return true here, srv_pipe_hnd.c will take care */
8137                 return true;
8138 @@ -710,7 +710,7 @@ static bool api_wbint_Gid2Sid(struct pip
8139
8140         r->out.result = _wbint_Gid2Sid(p, r);
8141
8142 -       if (p->rng_fault_state) {
8143 +       if (p->fault_state) {
8144                 talloc_free(r);
8145                 /* Return true here, srv_pipe_hnd.c will take care */
8146                 return true;
8147 @@ -790,7 +790,7 @@ static bool api_wbint_AllocateUid(struct
8148
8149         r->out.result = _wbint_AllocateUid(p, r);
8150
8151 -       if (p->rng_fault_state) {
8152 +       if (p->fault_state) {
8153                 talloc_free(r);
8154                 /* Return true here, srv_pipe_hnd.c will take care */
8155                 return true;
8156 @@ -870,7 +870,7 @@ static bool api_wbint_AllocateGid(struct
8157
8158         r->out.result = _wbint_AllocateGid(p, r);
8159
8160 -       if (p->rng_fault_state) {
8161 +       if (p->fault_state) {
8162                 talloc_free(r);
8163                 /* Return true here, srv_pipe_hnd.c will take care */
8164                 return true;
8165 @@ -950,7 +950,7 @@ static bool api_wbint_QueryUser(struct p
8166
8167         r->out.result = _wbint_QueryUser(p, r);
8168
8169 -       if (p->rng_fault_state) {
8170 +       if (p->fault_state) {
8171                 talloc_free(r);
8172                 /* Return true here, srv_pipe_hnd.c will take care */
8173                 return true;
8174 @@ -1030,7 +1030,7 @@ static bool api_wbint_LookupUserAliases(
8175
8176         r->out.result = _wbint_LookupUserAliases(p, r);
8177
8178 -       if (p->rng_fault_state) {
8179 +       if (p->fault_state) {
8180                 talloc_free(r);
8181                 /* Return true here, srv_pipe_hnd.c will take care */
8182                 return true;
8183 @@ -1110,7 +1110,7 @@ static bool api_wbint_LookupUserGroups(s
8184
8185         r->out.result = _wbint_LookupUserGroups(p, r);
8186
8187 -       if (p->rng_fault_state) {
8188 +       if (p->fault_state) {
8189                 talloc_free(r);
8190                 /* Return true here, srv_pipe_hnd.c will take care */
8191                 return true;
8192 @@ -1190,7 +1190,7 @@ static bool api_wbint_QuerySequenceNumbe
8193
8194         r->out.result = _wbint_QuerySequenceNumber(p, r);
8195
8196 -       if (p->rng_fault_state) {
8197 +       if (p->fault_state) {
8198                 talloc_free(r);
8199                 /* Return true here, srv_pipe_hnd.c will take care */
8200                 return true;
8201 @@ -1270,7 +1270,7 @@ static bool api_wbint_LookupGroupMembers
8202
8203         r->out.result = _wbint_LookupGroupMembers(p, r);
8204
8205 -       if (p->rng_fault_state) {
8206 +       if (p->fault_state) {
8207                 talloc_free(r);
8208                 /* Return true here, srv_pipe_hnd.c will take care */
8209                 return true;
8210 @@ -1350,7 +1350,7 @@ static bool api_wbint_QueryUserList(stru
8211
8212         r->out.result = _wbint_QueryUserList(p, r);
8213
8214 -       if (p->rng_fault_state) {
8215 +       if (p->fault_state) {
8216                 talloc_free(r);
8217                 /* Return true here, srv_pipe_hnd.c will take care */
8218                 return true;
8219 @@ -1430,7 +1430,7 @@ static bool api_wbint_QueryGroupList(str
8220
8221         r->out.result = _wbint_QueryGroupList(p, r);
8222
8223 -       if (p->rng_fault_state) {
8224 +       if (p->fault_state) {
8225                 talloc_free(r);
8226                 /* Return true here, srv_pipe_hnd.c will take care */
8227                 return true;
8228 @@ -1510,7 +1510,7 @@ static bool api_wbint_DsGetDcName(struct
8229
8230         r->out.result = _wbint_DsGetDcName(p, r);
8231
8232 -       if (p->rng_fault_state) {
8233 +       if (p->fault_state) {
8234                 talloc_free(r);
8235                 /* Return true here, srv_pipe_hnd.c will take care */
8236                 return true;
8237 @@ -1596,7 +1596,7 @@ static bool api_wbint_LookupRids(struct
8238
8239         r->out.result = _wbint_LookupRids(p, r);
8240
8241 -       if (p->rng_fault_state) {
8242 +       if (p->fault_state) {
8243                 talloc_free(r);
8244                 /* Return true here, srv_pipe_hnd.c will take care */
8245                 return true;
8246 @@ -1669,7 +1669,7 @@ static bool api_wbint_CheckMachineAccoun
8247
8248         r->out.result = _wbint_CheckMachineAccount(p, r);
8249
8250 -       if (p->rng_fault_state) {
8251 +       if (p->fault_state) {
8252                 talloc_free(r);
8253                 /* Return true here, srv_pipe_hnd.c will take care */
8254                 return true;
8255 @@ -1742,7 +1742,7 @@ static bool api_wbint_ChangeMachineAccou
8256
8257         r->out.result = _wbint_ChangeMachineAccount(p, r);
8258
8259 -       if (p->rng_fault_state) {
8260 +       if (p->fault_state) {
8261                 talloc_free(r);
8262                 /* Return true here, srv_pipe_hnd.c will take care */
8263                 return true;
8264 @@ -1815,7 +1815,7 @@ static bool api_wbint_PingDc(struct pipe
8265
8266         r->out.result = _wbint_PingDc(p, r);
8267
8268 -       if (p->rng_fault_state) {
8269 +       if (p->fault_state) {
8270                 talloc_free(r);
8271                 /* Return true here, srv_pipe_hnd.c will take care */
8272                 return true;
8273 --- a/source3/librpc/gen_ndr/srv_winreg.c
8274 +++ b/source3/librpc/gen_ndr/srv_winreg.c
8275 @@ -51,7 +51,7 @@ static bool api_winreg_OpenHKCR(struct p
8276
8277         r->out.result = _winreg_OpenHKCR(p, r);
8278
8279 -       if (p->rng_fault_state) {
8280 +       if (p->fault_state) {
8281                 talloc_free(r);
8282                 /* Return true here, srv_pipe_hnd.c will take care */
8283                 return true;
8284 @@ -131,7 +131,7 @@ static bool api_winreg_OpenHKCU(struct p
8285
8286         r->out.result = _winreg_OpenHKCU(p, r);
8287
8288 -       if (p->rng_fault_state) {
8289 +       if (p->fault_state) {
8290                 talloc_free(r);
8291                 /* Return true here, srv_pipe_hnd.c will take care */
8292                 return true;
8293 @@ -211,7 +211,7 @@ static bool api_winreg_OpenHKLM(struct p
8294
8295         r->out.result = _winreg_OpenHKLM(p, r);
8296
8297 -       if (p->rng_fault_state) {
8298 +       if (p->fault_state) {
8299                 talloc_free(r);
8300                 /* Return true here, srv_pipe_hnd.c will take care */
8301                 return true;
8302 @@ -291,7 +291,7 @@ static bool api_winreg_OpenHKPD(struct p
8303
8304         r->out.result = _winreg_OpenHKPD(p, r);
8305
8306 -       if (p->rng_fault_state) {
8307 +       if (p->fault_state) {
8308                 talloc_free(r);
8309                 /* Return true here, srv_pipe_hnd.c will take care */
8310                 return true;
8311 @@ -371,7 +371,7 @@ static bool api_winreg_OpenHKU(struct pi
8312
8313         r->out.result = _winreg_OpenHKU(p, r);
8314
8315 -       if (p->rng_fault_state) {
8316 +       if (p->fault_state) {
8317                 talloc_free(r);
8318                 /* Return true here, srv_pipe_hnd.c will take care */
8319                 return true;
8320 @@ -446,7 +446,7 @@ static bool api_winreg_CloseKey(struct p
8321         r->out.handle = r->in.handle;
8322         r->out.result = _winreg_CloseKey(p, r);
8323
8324 -       if (p->rng_fault_state) {
8325 +       if (p->fault_state) {
8326                 talloc_free(r);
8327                 /* Return true here, srv_pipe_hnd.c will take care */
8328                 return true;
8329 @@ -527,7 +527,7 @@ static bool api_winreg_CreateKey(struct
8330
8331         r->out.result = _winreg_CreateKey(p, r);
8332
8333 -       if (p->rng_fault_state) {
8334 +       if (p->fault_state) {
8335                 talloc_free(r);
8336                 /* Return true here, srv_pipe_hnd.c will take care */
8337                 return true;
8338 @@ -600,7 +600,7 @@ static bool api_winreg_DeleteKey(struct
8339
8340         r->out.result = _winreg_DeleteKey(p, r);
8341
8342 -       if (p->rng_fault_state) {
8343 +       if (p->fault_state) {
8344                 talloc_free(r);
8345                 /* Return true here, srv_pipe_hnd.c will take care */
8346                 return true;
8347 @@ -673,7 +673,7 @@ static bool api_winreg_DeleteValue(struc
8348
8349         r->out.result = _winreg_DeleteValue(p, r);
8350
8351 -       if (p->rng_fault_state) {
8352 +       if (p->fault_state) {
8353                 talloc_free(r);
8354                 /* Return true here, srv_pipe_hnd.c will take care */
8355                 return true;
8356 @@ -750,7 +750,7 @@ static bool api_winreg_EnumKey(struct pi
8357         r->out.last_changed_time = r->in.last_changed_time;
8358         r->out.result = _winreg_EnumKey(p, r);
8359
8360 -       if (p->rng_fault_state) {
8361 +       if (p->fault_state) {
8362                 talloc_free(r);
8363                 /* Return true here, srv_pipe_hnd.c will take care */
8364                 return true;
8365 @@ -829,7 +829,7 @@ static bool api_winreg_EnumValue(struct
8366         r->out.length = r->in.length;
8367         r->out.result = _winreg_EnumValue(p, r);
8368
8369 -       if (p->rng_fault_state) {
8370 +       if (p->fault_state) {
8371                 talloc_free(r);
8372                 /* Return true here, srv_pipe_hnd.c will take care */
8373                 return true;
8374 @@ -902,7 +902,7 @@ static bool api_winreg_FlushKey(struct p
8375
8376         r->out.result = _winreg_FlushKey(p, r);
8377
8378 -       if (p->rng_fault_state) {
8379 +       if (p->fault_state) {
8380                 talloc_free(r);
8381                 /* Return true here, srv_pipe_hnd.c will take care */
8382                 return true;
8383 @@ -977,7 +977,7 @@ static bool api_winreg_GetKeySecurity(st
8384         r->out.sd = r->in.sd;
8385         r->out.result = _winreg_GetKeySecurity(p, r);
8386
8387 -       if (p->rng_fault_state) {
8388 +       if (p->fault_state) {
8389                 talloc_free(r);
8390                 /* Return true here, srv_pipe_hnd.c will take care */
8391                 return true;
8392 @@ -1050,7 +1050,7 @@ static bool api_winreg_LoadKey(struct pi
8393
8394         r->out.result = _winreg_LoadKey(p, r);
8395
8396 -       if (p->rng_fault_state) {
8397 +       if (p->fault_state) {
8398                 talloc_free(r);
8399                 /* Return true here, srv_pipe_hnd.c will take care */
8400                 return true;
8401 @@ -1123,7 +1123,7 @@ static bool api_winreg_NotifyChangeKeyVa
8402
8403         r->out.result = _winreg_NotifyChangeKeyValue(p, r);
8404
8405 -       if (p->rng_fault_state) {
8406 +       if (p->fault_state) {
8407                 talloc_free(r);
8408                 /* Return true here, srv_pipe_hnd.c will take care */
8409                 return true;
8410 @@ -1203,7 +1203,7 @@ static bool api_winreg_OpenKey(struct pi
8411
8412         r->out.result = _winreg_OpenKey(p, r);
8413
8414 -       if (p->rng_fault_state) {
8415 +       if (p->fault_state) {
8416                 talloc_free(r);
8417                 /* Return true here, srv_pipe_hnd.c will take care */
8418                 return true;
8419 @@ -1326,7 +1326,7 @@ static bool api_winreg_QueryInfoKey(stru
8420
8421         r->out.result = _winreg_QueryInfoKey(p, r);
8422
8423 -       if (p->rng_fault_state) {
8424 +       if (p->fault_state) {
8425                 talloc_free(r);
8426                 /* Return true here, srv_pipe_hnd.c will take care */
8427                 return true;
8428 @@ -1404,7 +1404,7 @@ static bool api_winreg_QueryValue(struct
8429         r->out.data_length = r->in.data_length;
8430         r->out.result = _winreg_QueryValue(p, r);
8431
8432 -       if (p->rng_fault_state) {
8433 +       if (p->fault_state) {
8434                 talloc_free(r);
8435                 /* Return true here, srv_pipe_hnd.c will take care */
8436                 return true;
8437 @@ -1477,7 +1477,7 @@ static bool api_winreg_ReplaceKey(struct
8438
8439         r->out.result = _winreg_ReplaceKey(p, r);
8440
8441 -       if (p->rng_fault_state) {
8442 +       if (p->fault_state) {
8443                 talloc_free(r);
8444                 /* Return true here, srv_pipe_hnd.c will take care */
8445                 return true;
8446 @@ -1550,7 +1550,7 @@ static bool api_winreg_RestoreKey(struct
8447
8448         r->out.result = _winreg_RestoreKey(p, r);
8449
8450 -       if (p->rng_fault_state) {
8451 +       if (p->fault_state) {
8452                 talloc_free(r);
8453                 /* Return true here, srv_pipe_hnd.c will take care */
8454                 return true;
8455 @@ -1623,7 +1623,7 @@ static bool api_winreg_SaveKey(struct pi
8456
8457         r->out.result = _winreg_SaveKey(p, r);
8458
8459 -       if (p->rng_fault_state) {
8460 +       if (p->fault_state) {
8461                 talloc_free(r);
8462                 /* Return true here, srv_pipe_hnd.c will take care */
8463                 return true;
8464 @@ -1696,7 +1696,7 @@ static bool api_winreg_SetKeySecurity(st
8465
8466         r->out.result = _winreg_SetKeySecurity(p, r);
8467
8468 -       if (p->rng_fault_state) {
8469 +       if (p->fault_state) {
8470                 talloc_free(r);
8471                 /* Return true here, srv_pipe_hnd.c will take care */
8472                 return true;
8473 @@ -1769,7 +1769,7 @@ static bool api_winreg_SetValue(struct p
8474
8475         r->out.result = _winreg_SetValue(p, r);
8476
8477 -       if (p->rng_fault_state) {
8478 +       if (p->fault_state) {
8479                 talloc_free(r);
8480                 /* Return true here, srv_pipe_hnd.c will take care */
8481                 return true;
8482 @@ -1842,7 +1842,7 @@ static bool api_winreg_UnLoadKey(struct
8483
8484         r->out.result = _winreg_UnLoadKey(p, r);
8485
8486 -       if (p->rng_fault_state) {
8487 +       if (p->fault_state) {
8488                 talloc_free(r);
8489                 /* Return true here, srv_pipe_hnd.c will take care */
8490                 return true;
8491 @@ -1915,7 +1915,7 @@ static bool api_winreg_InitiateSystemShu
8492
8493         r->out.result = _winreg_InitiateSystemShutdown(p, r);
8494
8495 -       if (p->rng_fault_state) {
8496 +       if (p->fault_state) {
8497                 talloc_free(r);
8498                 /* Return true here, srv_pipe_hnd.c will take care */
8499                 return true;
8500 @@ -1988,7 +1988,7 @@ static bool api_winreg_AbortSystemShutdo
8501
8502         r->out.result = _winreg_AbortSystemShutdown(p, r);
8503
8504 -       if (p->rng_fault_state) {
8505 +       if (p->fault_state) {
8506                 talloc_free(r);
8507                 /* Return true here, srv_pipe_hnd.c will take care */
8508                 return true;
8509 @@ -2068,7 +2068,7 @@ static bool api_winreg_GetVersion(struct
8510
8511         r->out.result = _winreg_GetVersion(p, r);
8512
8513 -       if (p->rng_fault_state) {
8514 +       if (p->fault_state) {
8515                 talloc_free(r);
8516                 /* Return true here, srv_pipe_hnd.c will take care */
8517                 return true;
8518 @@ -2148,7 +2148,7 @@ static bool api_winreg_OpenHKCC(struct p
8519
8520         r->out.result = _winreg_OpenHKCC(p, r);
8521
8522 -       if (p->rng_fault_state) {
8523 +       if (p->fault_state) {
8524                 talloc_free(r);
8525                 /* Return true here, srv_pipe_hnd.c will take care */
8526                 return true;
8527 @@ -2228,7 +2228,7 @@ static bool api_winreg_OpenHKDD(struct p
8528
8529         r->out.result = _winreg_OpenHKDD(p, r);
8530
8531 -       if (p->rng_fault_state) {
8532 +       if (p->fault_state) {
8533                 talloc_free(r);
8534                 /* Return true here, srv_pipe_hnd.c will take care */
8535                 return true;
8536 @@ -2310,7 +2310,7 @@ static bool api_winreg_QueryMultipleValu
8537
8538         r->out.result = _winreg_QueryMultipleValues(p, r);
8539
8540 -       if (p->rng_fault_state) {
8541 +       if (p->fault_state) {
8542                 talloc_free(r);
8543                 /* Return true here, srv_pipe_hnd.c will take care */
8544                 return true;
8545 @@ -2383,7 +2383,7 @@ static bool api_winreg_InitiateSystemShu
8546
8547         r->out.result = _winreg_InitiateSystemShutdownEx(p, r);
8548
8549 -       if (p->rng_fault_state) {
8550 +       if (p->fault_state) {
8551                 talloc_free(r);
8552                 /* Return true here, srv_pipe_hnd.c will take care */
8553                 return true;
8554 @@ -2456,7 +2456,7 @@ static bool api_winreg_SaveKeyEx(struct
8555
8556         r->out.result = _winreg_SaveKeyEx(p, r);
8557
8558 -       if (p->rng_fault_state) {
8559 +       if (p->fault_state) {
8560                 talloc_free(r);
8561                 /* Return true here, srv_pipe_hnd.c will take care */
8562                 return true;
8563 @@ -2536,7 +2536,7 @@ static bool api_winreg_OpenHKPT(struct p
8564
8565         r->out.result = _winreg_OpenHKPT(p, r);
8566
8567 -       if (p->rng_fault_state) {
8568 +       if (p->fault_state) {
8569                 talloc_free(r);
8570                 /* Return true here, srv_pipe_hnd.c will take care */
8571                 return true;
8572 @@ -2616,7 +2616,7 @@ static bool api_winreg_OpenHKPN(struct p
8573
8574         r->out.result = _winreg_OpenHKPN(p, r);
8575
8576 -       if (p->rng_fault_state) {
8577 +       if (p->fault_state) {
8578                 talloc_free(r);
8579                 /* Return true here, srv_pipe_hnd.c will take care */
8580                 return true;
8581 @@ -2703,7 +2703,7 @@ static bool api_winreg_QueryMultipleValu
8582
8583         r->out.result = _winreg_QueryMultipleValues2(p, r);
8584
8585 -       if (p->rng_fault_state) {
8586 +       if (p->fault_state) {
8587                 talloc_free(r);
8588                 /* Return true here, srv_pipe_hnd.c will take care */
8589                 return true;
8590 @@ -2776,7 +2776,7 @@ static bool api_winreg_DeleteKeyEx(struc
8591
8592         r->out.result = _winreg_DeleteKeyEx(p, r);
8593
8594 -       if (p->rng_fault_state) {
8595 +       if (p->fault_state) {
8596                 talloc_free(r);
8597                 /* Return true here, srv_pipe_hnd.c will take care */
8598                 return true;
8599 --- a/source3/librpc/gen_ndr/srv_wkssvc.c
8600 +++ b/source3/librpc/gen_ndr/srv_wkssvc.c
8601 @@ -51,7 +51,7 @@ static bool api_wkssvc_NetWkstaGetInfo(s
8602
8603         r->out.result = _wkssvc_NetWkstaGetInfo(p, r);
8604
8605 -       if (p->rng_fault_state) {
8606 +       if (p->fault_state) {
8607                 talloc_free(r);
8608                 /* Return true here, srv_pipe_hnd.c will take care */
8609                 return true;
8610 @@ -126,7 +126,7 @@ static bool api_wkssvc_NetWkstaSetInfo(s
8611         r->out.parm_error = r->in.parm_error;
8612         r->out.result = _wkssvc_NetWkstaSetInfo(p, r);
8613
8614 -       if (p->rng_fault_state) {
8615 +       if (p->fault_state) {
8616                 talloc_free(r);
8617                 /* Return true here, srv_pipe_hnd.c will take care */
8618                 return true;
8619 @@ -208,7 +208,7 @@ static bool api_wkssvc_NetWkstaEnumUsers
8620
8621         r->out.result = _wkssvc_NetWkstaEnumUsers(p, r);
8622
8623 -       if (p->rng_fault_state) {
8624 +       if (p->fault_state) {
8625                 talloc_free(r);
8626                 /* Return true here, srv_pipe_hnd.c will take care */
8627                 return true;
8628 @@ -288,7 +288,7 @@ static bool api_wkssvc_NetrWkstaUserGetI
8629
8630         r->out.result = _wkssvc_NetrWkstaUserGetInfo(p, r);
8631
8632 -       if (p->rng_fault_state) {
8633 +       if (p->fault_state) {
8634                 talloc_free(r);
8635                 /* Return true here, srv_pipe_hnd.c will take care */
8636                 return true;
8637 @@ -363,7 +363,7 @@ static bool api_wkssvc_NetrWkstaUserSetI
8638         r->out.parm_err = r->in.parm_err;
8639         r->out.result = _wkssvc_NetrWkstaUserSetInfo(p, r);
8640
8641 -       if (p->rng_fault_state) {
8642 +       if (p->fault_state) {
8643                 talloc_free(r);
8644                 /* Return true here, srv_pipe_hnd.c will take care */
8645                 return true;
8646 @@ -445,7 +445,7 @@ static bool api_wkssvc_NetWkstaTransport
8647
8648         r->out.result = _wkssvc_NetWkstaTransportEnum(p, r);
8649
8650 -       if (p->rng_fault_state) {
8651 +       if (p->fault_state) {
8652                 talloc_free(r);
8653                 /* Return true here, srv_pipe_hnd.c will take care */
8654                 return true;
8655 @@ -520,7 +520,7 @@ static bool api_wkssvc_NetrWkstaTranspor
8656         r->out.parm_err = r->in.parm_err;
8657         r->out.result = _wkssvc_NetrWkstaTransportAdd(p, r);
8658
8659 -       if (p->rng_fault_state) {
8660 +       if (p->fault_state) {
8661                 talloc_free(r);
8662                 /* Return true here, srv_pipe_hnd.c will take care */
8663                 return true;
8664 @@ -593,7 +593,7 @@ static bool api_wkssvc_NetrWkstaTranspor
8665
8666         r->out.result = _wkssvc_NetrWkstaTransportDel(p, r);
8667
8668 -       if (p->rng_fault_state) {
8669 +       if (p->fault_state) {
8670                 talloc_free(r);
8671                 /* Return true here, srv_pipe_hnd.c will take care */
8672                 return true;
8673 @@ -668,7 +668,7 @@ static bool api_wkssvc_NetrUseAdd(struct
8674         r->out.parm_err = r->in.parm_err;
8675         r->out.result = _wkssvc_NetrUseAdd(p, r);
8676
8677 -       if (p->rng_fault_state) {
8678 +       if (p->fault_state) {
8679                 talloc_free(r);
8680                 /* Return true here, srv_pipe_hnd.c will take care */
8681                 return true;
8682 @@ -748,7 +748,7 @@ static bool api_wkssvc_NetrUseGetInfo(st
8683
8684         r->out.result = _wkssvc_NetrUseGetInfo(p, r);
8685
8686 -       if (p->rng_fault_state) {
8687 +       if (p->fault_state) {
8688                 talloc_free(r);
8689                 /* Return true here, srv_pipe_hnd.c will take care */
8690                 return true;
8691 @@ -821,7 +821,7 @@ static bool api_wkssvc_NetrUseDel(struct
8692
8693         r->out.result = _wkssvc_NetrUseDel(p, r);
8694
8695 -       if (p->rng_fault_state) {
8696 +       if (p->fault_state) {
8697                 talloc_free(r);
8698                 /* Return true here, srv_pipe_hnd.c will take care */
8699                 return true;
8700 @@ -903,7 +903,7 @@ static bool api_wkssvc_NetrUseEnum(struc
8701
8702         r->out.result = _wkssvc_NetrUseEnum(p, r);
8703
8704 -       if (p->rng_fault_state) {
8705 +       if (p->fault_state) {
8706                 talloc_free(r);
8707                 /* Return true here, srv_pipe_hnd.c will take care */
8708                 return true;
8709 @@ -976,7 +976,7 @@ static bool api_wkssvc_NetrMessageBuffer
8710
8711         r->out.result = _wkssvc_NetrMessageBufferSend(p, r);
8712
8713 -       if (p->rng_fault_state) {
8714 +       if (p->fault_state) {
8715                 talloc_free(r);
8716                 /* Return true here, srv_pipe_hnd.c will take care */
8717                 return true;
8718 @@ -1056,7 +1056,7 @@ static bool api_wkssvc_NetrWorkstationSt
8719
8720         r->out.result = _wkssvc_NetrWorkstationStatisticsGet(p, r);
8721
8722 -       if (p->rng_fault_state) {
8723 +       if (p->fault_state) {
8724                 talloc_free(r);
8725                 /* Return true here, srv_pipe_hnd.c will take care */
8726                 return true;
8727 @@ -1129,7 +1129,7 @@ static bool api_wkssvc_NetrLogonDomainNa
8728
8729         r->out.result = _wkssvc_NetrLogonDomainNameAdd(p, r);
8730
8731 -       if (p->rng_fault_state) {
8732 +       if (p->fault_state) {
8733                 talloc_free(r);
8734                 /* Return true here, srv_pipe_hnd.c will take care */
8735                 return true;
8736 @@ -1202,7 +1202,7 @@ static bool api_wkssvc_NetrLogonDomainNa
8737
8738         r->out.result = _wkssvc_NetrLogonDomainNameDel(p, r);
8739
8740 -       if (p->rng_fault_state) {
8741 +       if (p->fault_state) {
8742                 talloc_free(r);
8743                 /* Return true here, srv_pipe_hnd.c will take care */
8744                 return true;
8745 @@ -1275,7 +1275,7 @@ static bool api_wkssvc_NetrJoinDomain(st
8746
8747         r->out.result = _wkssvc_NetrJoinDomain(p, r);
8748
8749 -       if (p->rng_fault_state) {
8750 +       if (p->fault_state) {
8751                 talloc_free(r);
8752                 /* Return true here, srv_pipe_hnd.c will take care */
8753                 return true;
8754 @@ -1348,7 +1348,7 @@ static bool api_wkssvc_NetrUnjoinDomain(
8755
8756         r->out.result = _wkssvc_NetrUnjoinDomain(p, r);
8757
8758 -       if (p->rng_fault_state) {
8759 +       if (p->fault_state) {
8760                 talloc_free(r);
8761                 /* Return true here, srv_pipe_hnd.c will take care */
8762                 return true;
8763 @@ -1421,7 +1421,7 @@ static bool api_wkssvc_NetrRenameMachine
8764
8765         r->out.result = _wkssvc_NetrRenameMachineInDomain(p, r);
8766
8767 -       if (p->rng_fault_state) {
8768 +       if (p->fault_state) {
8769                 talloc_free(r);
8770                 /* Return true here, srv_pipe_hnd.c will take care */
8771                 return true;
8772 @@ -1494,7 +1494,7 @@ static bool api_wkssvc_NetrValidateName(
8773
8774         r->out.result = _wkssvc_NetrValidateName(p, r);
8775
8776 -       if (p->rng_fault_state) {
8777 +       if (p->fault_state) {
8778                 talloc_free(r);
8779                 /* Return true here, srv_pipe_hnd.c will take care */
8780                 return true;
8781 @@ -1575,7 +1575,7 @@ static bool api_wkssvc_NetrGetJoinInform
8782
8783         r->out.result = _wkssvc_NetrGetJoinInformation(p, r);
8784
8785 -       if (p->rng_fault_state) {
8786 +       if (p->fault_state) {
8787                 talloc_free(r);
8788                 /* Return true here, srv_pipe_hnd.c will take care */
8789                 return true;
8790 @@ -1656,7 +1656,7 @@ static bool api_wkssvc_NetrGetJoinableOu
8791
8792         r->out.result = _wkssvc_NetrGetJoinableOus(p, r);
8793
8794 -       if (p->rng_fault_state) {
8795 +       if (p->fault_state) {
8796                 talloc_free(r);
8797                 /* Return true here, srv_pipe_hnd.c will take care */
8798                 return true;
8799 @@ -1729,7 +1729,7 @@ static bool api_wkssvc_NetrJoinDomain2(s
8800
8801         r->out.result = _wkssvc_NetrJoinDomain2(p, r);
8802
8803 -       if (p->rng_fault_state) {
8804 +       if (p->fault_state) {
8805                 talloc_free(r);
8806                 /* Return true here, srv_pipe_hnd.c will take care */
8807                 return true;
8808 @@ -1802,7 +1802,7 @@ static bool api_wkssvc_NetrUnjoinDomain2
8809
8810         r->out.result = _wkssvc_NetrUnjoinDomain2(p, r);
8811
8812 -       if (p->rng_fault_state) {
8813 +       if (p->fault_state) {
8814                 talloc_free(r);
8815                 /* Return true here, srv_pipe_hnd.c will take care */
8816                 return true;
8817 @@ -1875,7 +1875,7 @@ static bool api_wkssvc_NetrRenameMachine
8818
8819         r->out.result = _wkssvc_NetrRenameMachineInDomain2(p, r);
8820
8821 -       if (p->rng_fault_state) {
8822 +       if (p->fault_state) {
8823                 talloc_free(r);
8824                 /* Return true here, srv_pipe_hnd.c will take care */
8825                 return true;
8826 @@ -1948,7 +1948,7 @@ static bool api_wkssvc_NetrValidateName2
8827
8828         r->out.result = _wkssvc_NetrValidateName2(p, r);
8829
8830 -       if (p->rng_fault_state) {
8831 +       if (p->fault_state) {
8832                 talloc_free(r);
8833                 /* Return true here, srv_pipe_hnd.c will take care */
8834                 return true;
8835 @@ -2029,7 +2029,7 @@ static bool api_wkssvc_NetrGetJoinableOu
8836
8837         r->out.result = _wkssvc_NetrGetJoinableOus2(p, r);
8838
8839 -       if (p->rng_fault_state) {
8840 +       if (p->fault_state) {
8841                 talloc_free(r);
8842                 /* Return true here, srv_pipe_hnd.c will take care */
8843                 return true;
8844 @@ -2102,7 +2102,7 @@ static bool api_wkssvc_NetrAddAlternateC
8845
8846         r->out.result = _wkssvc_NetrAddAlternateComputerName(p, r);
8847
8848 -       if (p->rng_fault_state) {
8849 +       if (p->fault_state) {
8850                 talloc_free(r);
8851                 /* Return true here, srv_pipe_hnd.c will take care */
8852                 return true;
8853 @@ -2175,7 +2175,7 @@ static bool api_wkssvc_NetrRemoveAlterna
8854
8855         r->out.result = _wkssvc_NetrRemoveAlternateComputerName(p, r);
8856
8857 -       if (p->rng_fault_state) {
8858 +       if (p->fault_state) {
8859                 talloc_free(r);
8860                 /* Return true here, srv_pipe_hnd.c will take care */
8861                 return true;
8862 @@ -2248,7 +2248,7 @@ static bool api_wkssvc_NetrSetPrimaryCom
8863
8864         r->out.result = _wkssvc_NetrSetPrimaryComputername(p, r);
8865
8866 -       if (p->rng_fault_state) {
8867 +       if (p->fault_state) {
8868                 talloc_free(r);
8869                 /* Return true here, srv_pipe_hnd.c will take care */
8870                 return true;
8871 @@ -2328,7 +2328,7 @@ static bool api_wkssvc_NetrEnumerateComp
8872
8873         r->out.result = _wkssvc_NetrEnumerateComputerNames(p, r);
8874
8875 -       if (p->rng_fault_state) {
8876 +       if (p->fault_state) {
8877                 talloc_free(r);
8878                 /* Return true here, srv_pipe_hnd.c will take care */
8879                 return true;
8880 --- a/source3/librpc/gen_ndr/srv_wmi.c
8881 +++ b/source3/librpc/gen_ndr/srv_wmi.c
8882 @@ -51,7 +51,7 @@ static bool api_Delete(struct pipes_stru
8883
8884         r->out.result = _Delete(p, r);
8885
8886 -       if (p->rng_fault_state) {
8887 +       if (p->fault_state) {
8888                 talloc_free(r);
8889                 /* Return true here, srv_pipe_hnd.c will take care */
8890                 return true;
8891 @@ -155,7 +155,7 @@ static bool api_OpenNamespace(struct pip
8892
8893         r->out.result = _OpenNamespace(p, r);
8894
8895 -       if (p->rng_fault_state) {
8896 +       if (p->fault_state) {
8897                 talloc_free(r);
8898                 /* Return true here, srv_pipe_hnd.c will take care */
8899                 return true;
8900 @@ -235,7 +235,7 @@ static bool api_CancelAsyncCall(struct p
8901
8902         r->out.result = _CancelAsyncCall(p, r);
8903
8904 -       if (p->rng_fault_state) {
8905 +       if (p->fault_state) {
8906                 talloc_free(r);
8907                 /* Return true here, srv_pipe_hnd.c will take care */
8908                 return true;
8909 @@ -321,7 +321,7 @@ static bool api_QueryObjectSink(struct p
8910
8911         r->out.result = _QueryObjectSink(p, r);
8912
8913 -       if (p->rng_fault_state) {
8914 +       if (p->fault_state) {
8915                 talloc_free(r);
8916                 /* Return true here, srv_pipe_hnd.c will take care */
8917                 return true;
8918 @@ -403,7 +403,7 @@ static bool api_GetObject(struct pipes_s
8919
8920         r->out.result = _GetObject(p, r);
8921
8922 -       if (p->rng_fault_state) {
8923 +       if (p->fault_state) {
8924                 talloc_free(r);
8925                 /* Return true here, srv_pipe_hnd.c will take care */
8926                 return true;
8927 @@ -483,7 +483,7 @@ static bool api_GetObjectAsync(struct pi
8928
8929         r->out.result = _GetObjectAsync(p, r);
8930
8931 -       if (p->rng_fault_state) {
8932 +       if (p->fault_state) {
8933                 talloc_free(r);
8934                 /* Return true here, srv_pipe_hnd.c will take care */
8935                 return true;
8936 @@ -564,7 +564,7 @@ static bool api_PutClass(struct pipes_st
8937
8938         r->out.result = _PutClass(p, r);
8939
8940 -       if (p->rng_fault_state) {
8941 +       if (p->fault_state) {
8942                 talloc_free(r);
8943                 /* Return true here, srv_pipe_hnd.c will take care */
8944                 return true;
8945 @@ -644,7 +644,7 @@ static bool api_PutClassAsync(struct pip
8946
8947         r->out.result = _PutClassAsync(p, r);
8948
8949 -       if (p->rng_fault_state) {
8950 +       if (p->fault_state) {
8951                 talloc_free(r);
8952                 /* Return true here, srv_pipe_hnd.c will take care */
8953                 return true;
8954 @@ -725,7 +725,7 @@ static bool api_DeleteClass(struct pipes
8955
8956         r->out.result = _DeleteClass(p, r);
8957
8958 -       if (p->rng_fault_state) {
8959 +       if (p->fault_state) {
8960                 talloc_free(r);
8961                 /* Return true here, srv_pipe_hnd.c will take care */
8962                 return true;
8963 @@ -805,7 +805,7 @@ static bool api_DeleteClassAsync(struct
8964
8965         r->out.result = _DeleteClassAsync(p, r);
8966
8967 -       if (p->rng_fault_state) {
8968 +       if (p->fault_state) {
8969                 talloc_free(r);
8970                 /* Return true here, srv_pipe_hnd.c will take care */
8971                 return true;
8972 @@ -891,7 +891,7 @@ static bool api_CreateClassEnum(struct p
8973
8974         r->out.result = _CreateClassEnum(p, r);
8975
8976 -       if (p->rng_fault_state) {
8977 +       if (p->fault_state) {
8978                 talloc_free(r);
8979                 /* Return true here, srv_pipe_hnd.c will take care */
8980                 return true;
8981 @@ -971,7 +971,7 @@ static bool api_CreateClassEnumAsync(str
8982
8983         r->out.result = _CreateClassEnumAsync(p, r);
8984
8985 -       if (p->rng_fault_state) {
8986 +       if (p->fault_state) {
8987                 talloc_free(r);
8988                 /* Return true here, srv_pipe_hnd.c will take care */
8989                 return true;
8990 @@ -1052,7 +1052,7 @@ static bool api_PutInstance(struct pipes
8991
8992         r->out.result = _PutInstance(p, r);
8993
8994 -       if (p->rng_fault_state) {
8995 +       if (p->fault_state) {
8996                 talloc_free(r);
8997                 /* Return true here, srv_pipe_hnd.c will take care */
8998                 return true;
8999 @@ -1132,7 +1132,7 @@ static bool api_PutInstanceAsync(struct
9000
9001         r->out.result = _PutInstanceAsync(p, r);
9002
9003 -       if (p->rng_fault_state) {
9004 +       if (p->fault_state) {
9005                 talloc_free(r);
9006                 /* Return true here, srv_pipe_hnd.c will take care */
9007                 return true;
9008 @@ -1213,7 +1213,7 @@ static bool api_DeleteInstance(struct pi
9009
9010         r->out.result = _DeleteInstance(p, r);
9011
9012 -       if (p->rng_fault_state) {
9013 +       if (p->fault_state) {
9014                 talloc_free(r);
9015                 /* Return true here, srv_pipe_hnd.c will take care */
9016                 return true;
9017 @@ -1293,7 +1293,7 @@ static bool api_DeleteInstanceAsync(stru
9018
9019         r->out.result = _DeleteInstanceAsync(p, r);
9020
9021 -       if (p->rng_fault_state) {
9022 +       if (p->fault_state) {
9023                 talloc_free(r);
9024                 /* Return true here, srv_pipe_hnd.c will take care */
9025                 return true;
9026 @@ -1379,7 +1379,7 @@ static bool api_CreateInstanceEnum(struc
9027
9028         r->out.result = _CreateInstanceEnum(p, r);
9029
9030 -       if (p->rng_fault_state) {
9031 +       if (p->fault_state) {
9032                 talloc_free(r);
9033                 /* Return true here, srv_pipe_hnd.c will take care */
9034                 return true;
9035 @@ -1459,7 +1459,7 @@ static bool api_CreateInstanceEnumAsync(
9036
9037         r->out.result = _CreateInstanceEnumAsync(p, r);
9038
9039 -       if (p->rng_fault_state) {
9040 +       if (p->fault_state) {
9041                 talloc_free(r);
9042                 /* Return true here, srv_pipe_hnd.c will take care */
9043                 return true;
9044 @@ -1545,7 +1545,7 @@ static bool api_ExecQuery(struct pipes_s
9045
9046         r->out.result = _ExecQuery(p, r);
9047
9048 -       if (p->rng_fault_state) {
9049 +       if (p->fault_state) {
9050                 talloc_free(r);
9051                 /* Return true here, srv_pipe_hnd.c will take care */
9052                 return true;
9053 @@ -1625,7 +1625,7 @@ static bool api_ExecQueryAsync(struct pi
9054
9055         r->out.result = _ExecQueryAsync(p, r);
9056
9057 -       if (p->rng_fault_state) {
9058 +       if (p->fault_state) {
9059                 talloc_free(r);
9060                 /* Return true here, srv_pipe_hnd.c will take care */
9061                 return true;
9062 @@ -1711,7 +1711,7 @@ static bool api_ExecNotificationQuery(st
9063
9064         r->out.result = _ExecNotificationQuery(p, r);
9065
9066 -       if (p->rng_fault_state) {
9067 +       if (p->fault_state) {
9068                 talloc_free(r);
9069                 /* Return true here, srv_pipe_hnd.c will take care */
9070                 return true;
9071 @@ -1791,7 +1791,7 @@ static bool api_ExecNotificationQueryAsy
9072
9073         r->out.result = _ExecNotificationQueryAsync(p, r);
9074
9075 -       if (p->rng_fault_state) {
9076 +       if (p->fault_state) {
9077                 talloc_free(r);
9078                 /* Return true here, srv_pipe_hnd.c will take care */
9079                 return true;
9080 @@ -1873,7 +1873,7 @@ static bool api_ExecMethod(struct pipes_
9081
9082         r->out.result = _ExecMethod(p, r);
9083
9084 -       if (p->rng_fault_state) {
9085 +       if (p->fault_state) {
9086                 talloc_free(r);
9087                 /* Return true here, srv_pipe_hnd.c will take care */
9088                 return true;
9089 @@ -1953,7 +1953,7 @@ static bool api_ExecMethodAsync(struct p
9090
9091         r->out.result = _ExecMethodAsync(p, r);
9092
9093 -       if (p->rng_fault_state) {
9094 +       if (p->fault_state) {
9095                 talloc_free(r);
9096                 /* Return true here, srv_pipe_hnd.c will take care */
9097                 return true;
9098 @@ -2077,7 +2077,7 @@ static bool api_Reset(struct pipes_struc
9099
9100         r->out.result = _Reset(p, r);
9101
9102 -       if (p->rng_fault_state) {
9103 +       if (p->fault_state) {
9104                 talloc_free(r);
9105                 /* Return true here, srv_pipe_hnd.c will take care */
9106                 return true;
9107 @@ -2169,7 +2169,7 @@ static bool api_IEnumWbemClassObject_Nex
9108
9109         r->out.result = _IEnumWbemClassObject_Next(p, r);
9110
9111 -       if (p->rng_fault_state) {
9112 +       if (p->fault_state) {
9113                 talloc_free(r);
9114                 /* Return true here, srv_pipe_hnd.c will take care */
9115                 return true;
9116 @@ -2249,7 +2249,7 @@ static bool api_NextAsync(struct pipes_s
9117
9118         r->out.result = _NextAsync(p, r);
9119
9120 -       if (p->rng_fault_state) {
9121 +       if (p->fault_state) {
9122                 talloc_free(r);
9123                 /* Return true here, srv_pipe_hnd.c will take care */
9124                 return true;
9125 @@ -2335,7 +2335,7 @@ static bool api_IEnumWbemClassObject_Clo
9126
9127         r->out.result = _IEnumWbemClassObject_Clone(p, r);
9128
9129 -       if (p->rng_fault_state) {
9130 +       if (p->fault_state) {
9131                 talloc_free(r);
9132                 /* Return true here, srv_pipe_hnd.c will take care */
9133                 return true;
9134 @@ -2415,7 +2415,7 @@ static bool api_Skip(struct pipes_struct
9135
9136         r->out.result = _Skip(p, r);
9137
9138 -       if (p->rng_fault_state) {
9139 +       if (p->fault_state) {
9140                 talloc_free(r);
9141                 /* Return true here, srv_pipe_hnd.c will take care */
9142                 return true;
9143 @@ -2527,7 +2527,7 @@ static bool api_Clone(struct pipes_struc
9144
9145         r->out.result = _Clone(p, r);
9146
9147 -       if (p->rng_fault_state) {
9148 +       if (p->fault_state) {
9149                 talloc_free(r);
9150                 /* Return true here, srv_pipe_hnd.c will take care */
9151                 return true;
9152 @@ -2607,7 +2607,7 @@ static bool api_GetNames(struct pipes_st
9153
9154         r->out.result = _GetNames(p, r);
9155
9156 -       if (p->rng_fault_state) {
9157 +       if (p->fault_state) {
9158                 talloc_free(r);
9159                 /* Return true here, srv_pipe_hnd.c will take care */
9160                 return true;
9161 @@ -2687,7 +2687,7 @@ static bool api_BeginEnumeration(struct
9162
9163         r->out.result = _BeginEnumeration(p, r);
9164
9165 -       if (p->rng_fault_state) {
9166 +       if (p->fault_state) {
9167                 talloc_free(r);
9168                 /* Return true here, srv_pipe_hnd.c will take care */
9169                 return true;
9170 @@ -2767,7 +2767,7 @@ static bool api_Next(struct pipes_struct
9171
9172         r->out.result = _Next(p, r);
9173
9174 -       if (p->rng_fault_state) {
9175 +       if (p->fault_state) {
9176                 talloc_free(r);
9177                 /* Return true here, srv_pipe_hnd.c will take care */
9178                 return true;
9179 @@ -2847,7 +2847,7 @@ static bool api_EndEnumeration(struct pi
9180
9181         r->out.result = _EndEnumeration(p, r);
9182
9183 -       if (p->rng_fault_state) {
9184 +       if (p->fault_state) {
9185                 talloc_free(r);
9186                 /* Return true here, srv_pipe_hnd.c will take care */
9187                 return true;
9188 @@ -2927,7 +2927,7 @@ static bool api_SetValue(struct pipes_st
9189
9190         r->out.result = _SetValue(p, r);
9191
9192 -       if (p->rng_fault_state) {
9193 +       if (p->fault_state) {
9194                 talloc_free(r);
9195                 /* Return true here, srv_pipe_hnd.c will take care */
9196                 return true;
9197 @@ -3007,7 +3007,7 @@ static bool api_GetValue(struct pipes_st
9198
9199         r->out.result = _GetValue(p, r);
9200
9201 -       if (p->rng_fault_state) {
9202 +       if (p->fault_state) {
9203                 talloc_free(r);
9204                 /* Return true here, srv_pipe_hnd.c will take care */
9205                 return true;
9206 @@ -3087,7 +3087,7 @@ static bool api_DeleteValue(struct pipes
9207
9208         r->out.result = _DeleteValue(p, r);
9209
9210 -       if (p->rng_fault_state) {
9211 +       if (p->fault_state) {
9212                 talloc_free(r);
9213                 /* Return true here, srv_pipe_hnd.c will take care */
9214                 return true;
9215 @@ -3167,7 +3167,7 @@ static bool api_DeleteAll(struct pipes_s
9216
9217         r->out.result = _DeleteAll(p, r);
9218
9219 -       if (p->rng_fault_state) {
9220 +       if (p->fault_state) {
9221                 talloc_free(r);
9222                 /* Return true here, srv_pipe_hnd.c will take care */
9223                 return true;
9224 @@ -3283,7 +3283,7 @@ static bool api_EstablishPosition(struct
9225
9226         r->out.result = _EstablishPosition(p, r);
9227
9228 -       if (p->rng_fault_state) {
9229 +       if (p->fault_state) {
9230                 talloc_free(r);
9231                 /* Return true here, srv_pipe_hnd.c will take care */
9232                 return true;
9233 @@ -3369,7 +3369,7 @@ static bool api_RequestChallenge(struct
9234
9235         r->out.result = _RequestChallenge(p, r);
9236
9237 -       if (p->rng_fault_state) {
9238 +       if (p->fault_state) {
9239                 talloc_free(r);
9240                 /* Return true here, srv_pipe_hnd.c will take care */
9241                 return true;
9242 @@ -3455,7 +3455,7 @@ static bool api_WBEMLogin(struct pipes_s
9243
9244         r->out.result = _WBEMLogin(p, r);
9245
9246 -       if (p->rng_fault_state) {
9247 +       if (p->fault_state) {
9248                 talloc_free(r);
9249                 /* Return true here, srv_pipe_hnd.c will take care */
9250                 return true;
9251 @@ -3541,7 +3541,7 @@ static bool api_NTLMLogin(struct pipes_s
9252
9253         r->out.result = _NTLMLogin(p, r);
9254
9255 -       if (p->rng_fault_state) {
9256 +       if (p->fault_state) {
9257                 talloc_free(r);
9258                 /* Return true here, srv_pipe_hnd.c will take care */
9259                 return true;
9260 @@ -3664,7 +3664,7 @@ static bool api_IWbemWCOSmartEnum_Next(s
9261
9262         r->out.result = _IWbemWCOSmartEnum_Next(p, r);
9263
9264 -       if (p->rng_fault_state) {
9265 +       if (p->fault_state) {
9266                 talloc_free(r);
9267                 /* Return true here, srv_pipe_hnd.c will take care */
9268                 return true;
9269 @@ -3772,7 +3772,7 @@ static bool api_Fetch(struct pipes_struc
9270
9271         r->out.result = _Fetch(p, r);
9272
9273 -       if (p->rng_fault_state) {
9274 +       if (p->fault_state) {
9275                 talloc_free(r);
9276                 /* Return true here, srv_pipe_hnd.c will take care */
9277                 return true;
9278 @@ -3858,7 +3858,7 @@ static bool api_Test(struct pipes_struct
9279
9280         r->out.result = _Test(p, r);
9281
9282 -       if (p->rng_fault_state) {
9283 +       if (p->fault_state) {
9284                 talloc_free(r);
9285                 /* Return true here, srv_pipe_hnd.c will take care */
9286                 return true;
9287 @@ -3967,7 +3967,7 @@ static bool api_GetResultObject(struct p
9288
9289         r->out.result = _GetResultObject(p, r);
9290
9291 -       if (p->rng_fault_state) {
9292 +       if (p->fault_state) {
9293                 talloc_free(r);
9294                 /* Return true here, srv_pipe_hnd.c will take care */
9295                 return true;
9296 @@ -4053,7 +4053,7 @@ static bool api_GetResultString(struct p
9297
9298         r->out.result = _GetResultString(p, r);
9299
9300 -       if (p->rng_fault_state) {
9301 +       if (p->fault_state) {
9302                 talloc_free(r);
9303                 /* Return true here, srv_pipe_hnd.c will take care */
9304                 return true;
9305 @@ -4139,7 +4139,7 @@ static bool api_GetResultServices(struct
9306
9307         r->out.result = _GetResultServices(p, r);
9308
9309 -       if (p->rng_fault_state) {
9310 +       if (p->fault_state) {
9311                 talloc_free(r);
9312                 /* Return true here, srv_pipe_hnd.c will take care */
9313                 return true;
9314 @@ -4225,7 +4225,7 @@ static bool api_GetCallStatus(struct pip
9315
9316         r->out.result = _GetCallStatus(p, r);
9317
9318 -       if (p->rng_fault_state) {
9319 +       if (p->fault_state) {
9320                 talloc_free(r);
9321                 /* Return true here, srv_pipe_hnd.c will take care */
9322                 return true;
9323 @@ -4330,7 +4330,7 @@ static bool api_SetStatus(struct pipes_s
9324
9325         r->out.result = _SetStatus(p, r);
9326
9327 -       if (p->rng_fault_state) {
9328 +       if (p->fault_state) {
9329                 talloc_free(r);
9330                 /* Return true here, srv_pipe_hnd.c will take care */
9331                 return true;
9332 @@ -4410,7 +4410,7 @@ static bool api_Indicate(struct pipes_st
9333
9334         r->out.result = _Indicate(p, r);
9335
9336 -       if (p->rng_fault_state) {
9337 +       if (p->fault_state) {
9338                 talloc_free(r);
9339                 /* Return true here, srv_pipe_hnd.c will take care */
9340                 return true;
9341 --- a/source3/librpc/gen_ndr/srv_wzcsvc.c
9342 +++ b/source3/librpc/gen_ndr/srv_wzcsvc.c
9343 @@ -44,7 +44,7 @@ static bool api_wzcsvc_EnumInterfaces(st
9344
9345         _wzcsvc_EnumInterfaces(p, r);
9346
9347 -       if (p->rng_fault_state) {
9348 +       if (p->fault_state) {
9349                 talloc_free(r);
9350                 /* Return true here, srv_pipe_hnd.c will take care */
9351                 return true;
9352 @@ -117,7 +117,7 @@ static bool api_wzcsvc_QueryInterface(st
9353
9354         _wzcsvc_QueryInterface(p, r);
9355
9356 -       if (p->rng_fault_state) {
9357 +       if (p->fault_state) {
9358                 talloc_free(r);
9359                 /* Return true here, srv_pipe_hnd.c will take care */
9360                 return true;
9361 @@ -190,7 +190,7 @@ static bool api_wzcsvc_SetInterface(stru
9362
9363         _wzcsvc_SetInterface(p, r);
9364
9365 -       if (p->rng_fault_state) {
9366 +       if (p->fault_state) {
9367                 talloc_free(r);
9368                 /* Return true here, srv_pipe_hnd.c will take care */
9369                 return true;
9370 @@ -263,7 +263,7 @@ static bool api_wzcsvc_RefreshInterface(
9371
9372         _wzcsvc_RefreshInterface(p, r);
9373
9374 -       if (p->rng_fault_state) {
9375 +       if (p->fault_state) {
9376                 talloc_free(r);
9377                 /* Return true here, srv_pipe_hnd.c will take care */
9378                 return true;
9379 @@ -336,7 +336,7 @@ static bool api_wzcsvc_QueryContext(stru
9380
9381         _wzcsvc_QueryContext(p, r);
9382
9383 -       if (p->rng_fault_state) {
9384 +       if (p->fault_state) {
9385                 talloc_free(r);
9386                 /* Return true here, srv_pipe_hnd.c will take care */
9387                 return true;
9388 @@ -409,7 +409,7 @@ static bool api_wzcsvc_SetContext(struct
9389
9390         _wzcsvc_SetContext(p, r);
9391
9392 -       if (p->rng_fault_state) {
9393 +       if (p->fault_state) {
9394                 talloc_free(r);
9395                 /* Return true here, srv_pipe_hnd.c will take care */
9396                 return true;
9397 @@ -482,7 +482,7 @@ static bool api_wzcsvc_EapolUIResponse(s
9398
9399         _wzcsvc_EapolUIResponse(p, r);
9400
9401 -       if (p->rng_fault_state) {
9402 +       if (p->fault_state) {
9403                 talloc_free(r);
9404                 /* Return true here, srv_pipe_hnd.c will take care */
9405                 return true;
9406 @@ -555,7 +555,7 @@ static bool api_wzcsvc_EapolGetCustomAut
9407
9408         _wzcsvc_EapolGetCustomAuthData(p, r);
9409
9410 -       if (p->rng_fault_state) {
9411 +       if (p->fault_state) {
9412                 talloc_free(r);
9413                 /* Return true here, srv_pipe_hnd.c will take care */
9414                 return true;
9415 @@ -628,7 +628,7 @@ static bool api_wzcsvc_EapolSetCustomAut
9416
9417         _wzcsvc_EapolSetCustomAuthData(p, r);
9418
9419 -       if (p->rng_fault_state) {
9420 +       if (p->fault_state) {
9421                 talloc_free(r);
9422                 /* Return true here, srv_pipe_hnd.c will take care */
9423                 return true;
9424 @@ -701,7 +701,7 @@ static bool api_wzcsvc_EapolGetInterface
9425
9426         _wzcsvc_EapolGetInterfaceParams(p, r);
9427
9428 -       if (p->rng_fault_state) {
9429 +       if (p->fault_state) {
9430                 talloc_free(r);
9431                 /* Return true here, srv_pipe_hnd.c will take care */
9432                 return true;
9433 @@ -774,7 +774,7 @@ static bool api_wzcsvc_EapolSetInterface
9434
9435         _wzcsvc_EapolSetInterfaceParams(p, r);
9436
9437 -       if (p->rng_fault_state) {
9438 +       if (p->fault_state) {
9439                 talloc_free(r);
9440                 /* Return true here, srv_pipe_hnd.c will take care */
9441                 return true;
9442 @@ -847,7 +847,7 @@ static bool api_wzcsvc_EapolReAuthentica
9443
9444         _wzcsvc_EapolReAuthenticateInterface(p, r);
9445
9446 -       if (p->rng_fault_state) {
9447 +       if (p->fault_state) {
9448                 talloc_free(r);
9449                 /* Return true here, srv_pipe_hnd.c will take care */
9450                 return true;
9451 @@ -920,7 +920,7 @@ static bool api_wzcsvc_EapolQueryInterfa
9452
9453         _wzcsvc_EapolQueryInterfaceState(p, r);
9454
9455 -       if (p->rng_fault_state) {
9456 +       if (p->fault_state) {
9457                 talloc_free(r);
9458                 /* Return true here, srv_pipe_hnd.c will take care */
9459                 return true;
9460 @@ -993,7 +993,7 @@ static bool api_wzcsvc_OpenWZCDbLogSessi
9461
9462         _wzcsvc_OpenWZCDbLogSession(p, r);
9463
9464 -       if (p->rng_fault_state) {
9465 +       if (p->fault_state) {
9466                 talloc_free(r);
9467                 /* Return true here, srv_pipe_hnd.c will take care */
9468                 return true;
9469 @@ -1066,7 +1066,7 @@ static bool api_wzcsvc_CloseWZCDbLogSess
9470
9471         _wzcsvc_CloseWZCDbLogSession(p, r);
9472
9473 -       if (p->rng_fault_state) {
9474 +       if (p->fault_state) {
9475                 talloc_free(r);
9476                 /* Return true here, srv_pipe_hnd.c will take care */
9477                 return true;
9478 @@ -1139,7 +1139,7 @@ static bool api_wzcsvc_EnumWZCDbLogRecor
9479
9480         _wzcsvc_EnumWZCDbLogRecords(p, r);
9481
9482 -       if (p->rng_fault_state) {
9483 +       if (p->fault_state) {
9484                 talloc_free(r);
9485                 /* Return true here, srv_pipe_hnd.c will take care */
9486                 return true;
9487 @@ -1212,7 +1212,7 @@ static bool api_wzcsvc_FlushWZCdbLog(str
9488
9489         _wzcsvc_FlushWZCdbLog(p, r);
9490
9491 -       if (p->rng_fault_state) {
9492 +       if (p->fault_state) {
9493                 talloc_free(r);
9494                 /* Return true here, srv_pipe_hnd.c will take care */
9495                 return true;
9496 @@ -1285,7 +1285,7 @@ static bool api_wzcsvc_GetWZCDbLogRecord
9497
9498         _wzcsvc_GetWZCDbLogRecord(p, r);
9499
9500 -       if (p->rng_fault_state) {
9501 +       if (p->fault_state) {
9502                 talloc_free(r);
9503                 /* Return true here, srv_pipe_hnd.c will take care */
9504                 return true;
9505 --- a/source3/librpc/gen_ndr/srv_xattr.c
9506 +++ b/source3/librpc/gen_ndr/srv_xattr.c
9507 @@ -44,7 +44,7 @@ static bool api_xattr_parse_DOSATTRIB(st
9508
9509         _xattr_parse_DOSATTRIB(p, r);
9510
9511 -       if (p->rng_fault_state) {
9512 +       if (p->fault_state) {
9513                 talloc_free(r);
9514                 /* Return true here, srv_pipe_hnd.c will take care */
9515                 return true;