Skip to content

Commit

Permalink
Merge rolemgmt changes into master
Browse files Browse the repository at this point in the history
Change-Id: I577674dda96531ee09ad6de03bbe357d22593f3e
Signed-off-by: Tapas Kundu <tkundu@vmware.com>
(cherry picked from commit 2a8bf6a)
  • Loading branch information
tapakund committed Aug 21, 2019
1 parent 7e12e46 commit 8d6e70e
Show file tree
Hide file tree
Showing 86 changed files with 7,585 additions and 227 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ pmd.spec
*_sstub.c
.deps
.libs
.rpm
rpms


# autoconf
Expand Down Expand Up @@ -46,6 +48,7 @@ ar-lib
/server/pmd
/tools/cli/pmd-cli
/privsep/pmdprivsepd
/tools/pmd.spec
build/*

# Object files
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLEANFILES =
EXTRA_DIST =
noinst_DATA =
conf_DATA = conf/pmd.conf
pkginclude_HEADERS = include/pmd.h include/pmdtypes.h include/pmderror.h
pkginclude_HEADERS = include/pmd.h include/pmdtypes.h include/pmderror.h include/roleplugin.h
pkgconfigdir = $(libdir)/pkgconfig

SUBDIRS = \
Expand Down
16 changes: 12 additions & 4 deletions client/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ libpmdclient_la_SOURCES = \
pmd_cstub.c \
netmgmt_cstub.c \
netmgr_api.c \
rolemgmt_api.c \
rolemgmt_cstub.c \
usermgmt_api.c \
usermgmt_cstub.c \
usermgmt_rpc_misc.c \
Expand Down Expand Up @@ -50,6 +52,9 @@ netmgmt_cstub.c:
cp ../idl/netmgmt_cstub.c .


rolemgmt_cstub.c:
cp ../idl/rolemgmt_cstub.c .

usermgmt_cstub.c:
cp ../idl/usermgmt_cstub.c .

Expand Down Expand Up @@ -80,14 +85,17 @@ CLEANFILES = \
pkgmgmt_privsep_cstub.c \
netgmgmt_privsep_cstub.c \
fwgmgmt_privsep_cstub.c \
usergmgmt_privsep_cstub.c
usergmgmt_privsep_cstub.c \
rolemgmt_cstub.c \
rpmostree_cstub.c

libpmdclient_la_LIBADD = \
@top_builddir@/common/libcommon.la \
@DCERPC_LIBS@ \
@LWBASE_LIBS@ \
-lpthread
-lpthread \
-llwbase_nothr

libpmdclient_la_LDFLAGS= \
@DCERPC_LDFLAGS@ \
@LW_LDFLAGS@
@LW_LDFLAGS@ \
@DCERPC_LDFLAGS@
6 changes: 3 additions & 3 deletions client/includes.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2016-2017 VMware, Inc. All Rights Reserved.
* Copyright © 2016-2019 VMware, Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
Expand All @@ -11,7 +11,6 @@
* License for the specific language governing permissions and limitations
* under the License.
*/

#pragma once

#include <lw/base.h>
Expand All @@ -20,7 +19,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>

#include <dce/rpc.h>
#include <dce/dcethread.h>
#include <dce/dce_error.h>
Expand All @@ -32,6 +30,8 @@
#include "../idl/pkgmgmt_h.h"
#include "../idl/pmd_h.h"
#include "../idl/netmgmt_h.h"
#include "../idl/rolemgmt_h.h"
#include "../idl/rpmostree_h.h"
#include "../idl/usermgmt_h.h"

#include "../idl/privsepd_h.h"
Expand Down
3 changes: 1 addition & 2 deletions client/pkgmgmt_api.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2016-2017 VMware, Inc. All Rights Reserved.
* Copyright © 2016-2019 VMware, Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
Expand All @@ -12,7 +12,6 @@
* under the License.
*/


#include "includes.h"

uint32_t
Expand Down
Loading

0 comments on commit 8d6e70e

Please sign in to comment.